Upgrade to symfony 3.4 and other dep updates, fixes #975

app/Resources/FOSUserBundle/views/Profile/edit_content.html.twig

@@ -1,4 +1,4 @@
-<form action="{{ path('fos_user_profile_edit') }}" {{ form_enctype(form) }} method="POST" class="fos_user_profile_edit col-md-6">
+{{ form_start(form, { 'action': path('fos_user_profile_edit'), 'attr': { 'class': 'fos_user_profile_edit col-md-6' } }) }}
     {{ form_errors(form) }}
 
     <div class="form-group clearfix">
@@ -56,7 +56,7 @@
             <p><a href="{{ path('user_github_disconnect', {token: csrf_token('unlink_github')}) }}">Disconnect your GitHub account</a> to connect another one.</p>
         {% endif %}
     {% endif %}
-</form>
+{{ form_end(form) }}
 
 <div class="col-md-2">
 </div>

app/Resources/FOSUserBundle/views/Profile/show.html.twig

@@ -40,7 +40,7 @@
         {% endif %}
     {% endif %}
 
-    {% embed "PackagistWebBundle:Web:list.html.twig" with {noLayout: 'true', showAutoUpdateWarning: true} %}
+    {% embed "PackagistWebBundle:web:list.html.twig" with {noLayout: 'true', showAutoUpdateWarning: true} %}
         {% block content_title %}
             <h3 class="font-normal">{{ 'packages.yours'|trans }}</h3>
         {% endblock %}

app/Resources/HWIOAuthBundle/views/Connect/connect_confirm.html.twig

@@ -7,13 +7,13 @@
 
     <div class="col-md-6">
         <p>{{ 'connect.confirm.text' | trans({'%service%': service | trans({}, 'HWIOAuthBundle'), '%name%': userInformation.realName}, 'HWIOAuthBundle') }}</p>
-        <form action="{{ path('hwi_oauth_connect_service', {'service': service, 'key': key}) }}" {{ form_enctype(form) }} method="POST" class="fos_user_registration_register">
+        {{ form_start(form, {'action': path('hwi_oauth_connect_service', {'service': service, 'key': key}), 'attr': {'class': 'fos_user_registration_register'}}) }}
             {{ form_widget(form) }}
             <div>
                 <button type="submit" class="btn btn-primary">{{ 'connect.confirm.submit' | trans({}, 'HWIOAuthBundle') }}</button>
                 <a href="{{ path('hwi_oauth_connect') }}" class="btn btn-warning">{{ 'connect.confirm.cancel' | trans({}, 'HWIOAuthBundle') }}</a>
             </div>
-        </form>
+        {{ form_end(form) }}
     </div>
     <div class="col-md-6">
         {% if userInformation.profilePicture is defined and userInformation.profilePicture is not empty %}

app/Resources/HWIOAuthBundle/views/Connect/registration.html.twig

@@ -5,13 +5,13 @@
         <h2 class="title">{{ 'header.register' | trans({'%name%': userInformation.realName}, 'HWIOAuthBundle') }}</h2>
     </div>
     <div class="col-md-6">
-        <form action="{{ path('hwi_oauth_connect_registration', {'key': key}) }}" {{ form_enctype(form) }} method="POST" class="hwi_oauth_registration_register">
+        {{ form_start(form, {'action': path('hwi_oauth_connect_registration', {'key': key}), 'attr': {'class': 'hwi_oauth_registration_register'}}) }}
             {{ form_widget(form) }}
             <div>
                 <button type="submit" class="btn btn-primary">{{ 'connect.registration.submit'|trans({}, 'HWIOAuthBundle') }}</button>
                 <a href="{{ path('hwi_oauth_connect') }}" class="btn btn-warning">{{ 'connect.registration.cancel' | trans({}, 'HWIOAuthBundle') }}</a>
             </div>
-        </form>
+        {{ form_end(form) }}
     </div>
     <div class="col-md-6">
         {% if userInformation.profilePicture is not empty %}

app/config/config.yml

@@ -21,7 +21,6 @@ framework:
         cookie_lifetime: 3600
         cookie_httponly: true
         save_path: '%session_save_path%'
-    trusted_proxies: '%trusted_proxies%'
     trusted_hosts: '%trusted_hosts%'
     http_method_override: true
     fragments: ~
@@ -94,7 +93,7 @@ fos_user:
         sender_name:    '%mailer_from_name%'
     profile:
         form:
-            type:       packagist_user_profile
+            type: Packagist\WebBundle\Form\Type\ProfileFormType
 
 hwi_oauth:
     firewall_names: [main]
@@ -139,3 +138,6 @@ httplug:
             plugins: ['httplug.plugin.logger']
             config:
                 timeout: 2
+
+sensio_framework_extra:
+    router: { annotations: false }

app/config/config_prod.yml

@@ -23,6 +23,7 @@ monolog:
             action_level: error
             handler:      nested
             channels: ['!event']
+            # in sf4 excluded_http_codes: [404]
             excluded_404s:
                 - ^/
         nested:
@@ -33,12 +34,12 @@ monolog:
 
         console_debug:
             type:   console
+            include_stacktraces: true
             verbosity_levels:
                 VERBOSITY_NORMAL: EMERGENCY
                 VERBOSITY_VERBOSE: INFO
                 VERBOSITY_VERY_VERBOSE: NOTICE
                 VERBOSITY_DEBUG: DEBUG
-            formatter: packagist.console_stack_trace_line_formatter
 
 snc_redis:
     clients:
@@ -62,8 +63,6 @@ framework:
     session:
         handler_id: snc_redis.session.handler
         cookie_secure: '%force_ssl%'
-    validation:
-        cache: '%validation_cache_backend%'
 
 nelmio_security:
     clickjacking:

app/config/parameters.yml.dist

@@ -45,9 +45,7 @@ parameters:
 
     # set to true to enforce ssl, make sure you have a proper certificate in place
     force_ssl: false
-    # e.g. [127.0.0.1] if the app is running behind a reverse proxy on localhost
-    trusted_proxies: ~
-    # e.g. ['.*\.?packagist\.org$'] to allow packagist.org and all subdomains as valid hosts
+    # e.g. ['^(.+\.)?packagist\.org$'] to allow packagist.org and all subdomains as valid hosts
     trusted_hosts: ~
 
     # -- Algolia credentials --

app/config/security.yml

@@ -24,6 +24,7 @@ security:
                 name: pauth
                 always_remember_me: true
                 lifetime: 31104000 # 1y
+            logout_on_user_change: true
             logout:       true
             anonymous:    true
             oauth:

composer.json

@@ -26,15 +26,15 @@
     },
     "require": {
         "php": ">=7.0",
-        "symfony/symfony": "^2.8",
+        "symfony/symfony": "^3.4",
         "doctrine/orm": "^2.4",
         "doctrine/doctrine-bundle": "^1.2",
         "doctrine/doctrine-cache-bundle": "^1.3",
         "twig/extensions": "^1.0",
-        "symfony/swiftmailer-bundle": "^2.3",
-        "symfony/monolog-bundle": "^2.4",
+        "symfony/swiftmailer-bundle": "^3.0",
+        "symfony/monolog-bundle": "^3.1",
         "sensio/distribution-bundle": "^5.0",
-        "sensio/framework-extra-bundle": "^3.0",
+        "sensio/framework-extra-bundle": "^5.0",
         "sensio/generator-bundle": "^3.0",
 
         "composer/composer": "^1.8@dev",
@@ -47,18 +47,18 @@
         "zendframework/zend-feed": "^2.0",
         "zendframework/zend-servicemanager": "^2.0",
         "zendframework/zend-uri": "^2.0",
-        "pagerfanta/pagerfanta": "^1.0",
+        "pagerfanta/pagerfanta": "^2.0",
         "knplabs/knp-menu-bundle": "^2.1",
         "ezyang/htmlpurifier": "^4.6",
         "nelmio/cors-bundle": "^1.4",
         "cebe/markdown": "^1.1",
-        "algolia/algoliasearch-client-php": "^1.18",
+        "algolia/algoliasearch-client-php": "^2.0",
         "seld/signal-handler": "^1.1",
         "php-http/httplug-bundle": "^1.11",
         "php-http/guzzle6-adapter": "^1.1"
     },
     "require-dev": {
-        "symfony/phpunit-bridge": "^2.7 || ^3.0",
+        "symfony/phpunit-bridge": "^4.2",
         "phpunit/phpunit": "^6.5"
     },
     "scripts": {

src/Packagist/WebBundle/Command/IndexPackagesCommand.php

@@ -98,7 +98,7 @@ class IndexPackagesCommand extends ContainerAwareCommand
                 $output->writeln('Deleting existing index');
             }
 
-            $index->clearIndex();
+            $index->clear();
         }
 
         $total = count($ids);
@@ -148,7 +148,7 @@ class IndexPackagesCommand extends ContainerAwareCommand
             }
 
             try {
-                $index->addObjects($records);
+                $index->saveObjects($records);
             } catch (\Exception $e) {
                 $output->writeln('<error>'.get_class($e).': '.$e->getMessage().', occurred while processing packages: '.implode(',', $idsSlice).'</error>');
                 continue;

src/Packagist/WebBundle/Controller/PackageController.php

@@ -291,7 +291,7 @@ class PackageController extends Controller
             });
         } catch (ConnectionException $e) {}
 
-        return $this->render('PackagistWebBundle:Package:providers.html.twig', array(
+        return $this->render('PackagistWebBundle:package:providers.html.twig', array(
             'name' => $name,
             'packages' => $providers,
             'meta' => $this->getPackagesMetadata($providers),
@@ -498,7 +498,7 @@ class PackageController extends Controller
         $repo = $this->getDoctrine()->getRepository('PackagistWebBundle:Version');
 
         $html = $this->renderView(
-            'PackagistWebBundle:Package:versionDetails.html.twig',
+            'PackagistWebBundle:Package:version_details.html.twig',
             array('version' => $repo->getFullVersion($versionId))
         );
 
@@ -627,7 +627,7 @@ class PackageController extends Controller
     }
 
     /**
-     * @Template("PackagistWebBundle:Package:viewPackage.html.twig")
+     * @Template("PackagistWebBundle:package:view_package.html.twig")
      * @Route("/packages/{name}/maintainers/", name="add_maintainer", requirements={"name"="[A-Za-z0-9_.-]+/[A-Za-z0-9_.-]+"})
      */
     public function createMaintainerAction(Request $req, $name)
@@ -684,7 +684,7 @@ class PackageController extends Controller
     }
 
     /**
-     * @Template("PackagistWebBundle:Package:viewPackage.html.twig")
+     * @Template("PackagistWebBundle:package:view_package.html.twig")
      * @Route("/packages/{name}/maintainers/delete", name="remove_maintainer", requirements={"name"="[A-Za-z0-9_.-]+/[A-Za-z0-9_.-]+"})
      */
     public function removeMaintainerAction(Request $req, $name)
@@ -910,7 +910,7 @@ class PackageController extends Controller
         $data['meta'] = $this->getPackagesMetadata($data['packages']);
         $data['name'] = $name;
 
-        return $this->render('PackagistWebBundle:Package:dependents.html.twig', $data);
+        return $this->render('PackagistWebBundle:package:dependents.html.twig', $data);
     }
 
     /**
@@ -939,7 +939,7 @@ class PackageController extends Controller
         $data['meta'] = $this->getPackagesMetadata($data['packages']);
         $data['name'] = $name;
 
-        return $this->render('PackagistWebBundle:Package:suggesters.html.twig', $data);
+        return $this->render('PackagistWebBundle:package:suggesters.html.twig', $data);
     }
 
     /**

src/Packagist/WebBundle/Controller/WebController.php

@@ -37,7 +37,7 @@ class WebController extends Controller
     }
 
     /**
-     * Rendered by views/Web/searchSection.html.twig
+     * Rendered by views/Web/search_section.html.twig
      */
     public function searchFormAction(Request $req)
     {
@@ -51,7 +51,7 @@ class WebController extends Controller
 
         $form->handleRequest($req);
 
-        return $this->render('PackagistWebBundle:Web:searchForm.html.twig', array(
+        return $this->render('PackagistWebBundle:web:search_form.html.twig', array(
             'searchQuery' => $req->query->get('search_query')['query'] ?? '',
         ));
     }
@@ -72,7 +72,7 @@ class WebController extends Controller
         $tagsFilter = $req->query->get('tags');
 
         if ($req->getRequestFormat() !== 'json') {
-            return $this->render('PackagistWebBundle:Web:search.html.twig', [
+            return $this->render('PackagistWebBundle:web:search.html.twig', [
                 'packages' => [],
             ]);
         }

src/Packagist/WebBundle/Model/PackageManager.php

@@ -104,7 +104,7 @@ class PackageManager
             }
 
             if ($recipients) {
-                $body = $this->twig->render('PackagistWebBundle:Email:update_failed.txt.twig', array(
+                $body = $this->twig->render('PackagistWebBundle:email:update_failed.txt.twig', array(
                     'package' => $package,
                     'exception' => get_class($e),
                     'exceptionMessage' => $e->getMessage(),
@@ -136,7 +136,7 @@ class PackageManager
 
     public function notifyNewMaintainer($user, $package)
     {
-        $body = $this->twig->render('PackagistWebBundle:Email:maintainer_added.txt.twig', array(
+        $body = $this->twig->render('PackagistWebBundle:email:maintainer_added.txt.twig', array(
             'package_name' => $package->getName()
         ));
 

src/Packagist/WebBundle/Resources/config/services.yml

@@ -1,21 +1,32 @@
 services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
+        public: false
+        bind:
+
+
     packagist.twig.extension:
+        public: true
         class: Packagist\WebBundle\Twig\PackagistExtension
         arguments: [ '@packagist.provider_manager', '@security.csrf.token_manager' ]
         tags:
             - { name: twig.extension }
 
     twig.extension.text:
+        public: true
         class: Twig_Extensions_Extension_Text
         tags:
             - { name: twig.extension }
 
     packagist.cache_listener:
+        public: true
         class: Packagist\WebBundle\EventListener\CacheListener
         tags:
             - { name: kernel.event_listener, event: kernel.response, method: onResponse }
 
     packagist.logged_in_user_cannot_register_listener:
+        public: true
         class: Packagist\WebBundle\EventListener\LoggedInUserCannotRegisterListener
         arguments:
             - '@security.authorization_checker'
@@ -24,35 +35,40 @@ services:
             - { name: kernel.event_subscriber }
 
     packagist.registration_listener:
+        public: true
         class: Packagist\WebBundle\EventListener\RegistrationListener
         arguments: [ '@fos_user.util.token_generator' ]
         tags:
             - { name: kernel.event_subscriber }
 
     guzzle_client:
+        public: true
         class: GuzzleHttp\Client
         arguments: [{timeout: 3}]
 
     packagist.package_dumper:
+        public: true
         class: Packagist\WebBundle\Package\SymlinkDumper
         arguments: [ '@doctrine', '@filesystem', '@router', '@snc_redis.default_client', '%kernel.root_dir%/../web/', '%packagist_metadata_dir%', '%packagist_dumper_compress%' ]
 
     packagist.user_provider:
         class: Packagist\WebBundle\Security\Provider\UserProvider
-        public: false
         arguments: ['@fos_user.user_manager', '@fos_user.user_provider.username_email', '@scheduler']
 
     packagist.user_repository:
+        public: true
         class: Packagist\WebBundle\Entity\UserRepository
         factory: ['@doctrine', getRepository]
         arguments: ['PackagistWebBundle:User']
 
     packagist.package_repository:
+        public: true
         class: Packagist\WebBundle\Entity\PackageRepository
         factory: ['@doctrine', getRepository]
         arguments: ['PackagistWebBundle:Package']
 
     packagist.version_repository:
+        public: true
         class: Packagist\WebBundle\Entity\VersionRepository
         factory: ['@doctrine', getRepository]
         arguments: ['PackagistWebBundle:Version']
@@ -60,10 +76,12 @@ services:
             - [ setRedis, [ '@snc_redis.cache_client' ]]
 
     packagist.package_updater:
+        public: true
         class: Packagist\WebBundle\Package\Updater
         arguments: ['@doctrine']
 
     fos_user.util.user_manipulator:
+        public: true
         class: Packagist\WebBundle\Util\UserManipulator
         arguments:
             - '@fos_user.user_manager'
@@ -72,33 +90,39 @@ services:
             - '@request_stack'
 
     packagist.oauth.registration_form_handler:
+        public: true
         class: Packagist\WebBundle\Form\Handler\OAuthRegistrationFormHandler
         arguments: ['@fos_user.user_manager', '@fos_user.util.token_generator']
 
     packagist.oauth.registration_form_type:
+        public: true
         class: Packagist\WebBundle\Form\Type\OAuthRegistrationFormType
         tags:
             - { name: form.type, alias: packagist_oauth_user_registration }
 
     packagist.oauth.registration_form:
+        public: true
         factory: ['@form.factory', create]
         class: Symfony\Component\Form\Form
         arguments:
             - 'packagist_oauth_user_registration'
 
     packagist.download_manager:
+        public: true
         class: Packagist\WebBundle\Model\DownloadManager
         arguments:
             - '@snc_redis.default_client'
             - '@doctrine'
 
     packagist.provider_manager:
+        public: true
         class: Packagist\WebBundle\Model\ProviderManager
         arguments:
             - '@snc_redis.default_client'
             - '@packagist.package_repository'
 
     packagist.favorite_manager:
+        public: true
         class: Packagist\WebBundle\Model\FavoriteManager
         arguments:
             - '@snc_redis.default_client'
@@ -106,6 +130,7 @@ services:
             - '@packagist.user_repository'
 
     packagist.package_manager:
+        public: true
         class: Packagist\WebBundle\Model\PackageManager
         arguments:
             - '@doctrine'
@@ -120,35 +145,40 @@ services:
             - '%packagist_metadata_dir%'
 
     packagist.profile.form.type:
+        public: true
         class: Packagist\WebBundle\Form\Type\ProfileFormType
         arguments: ['%fos_user.model.user.class%']
         tags:
             - { name: form.type, alias: packagist_user_profile }
 
     packagist.menu_builder:
+        public: true
         class: Packagist\WebBundle\Menu\MenuBuilder
         arguments: ['@knp_menu.factory', '@security.token_storage', '@translator']
 
     packagist.menu.user:
+        public: true
         class: Knp\Menu\MenuItem
         factory: ['@packagist.menu_builder', createUserMenu]
         tags:
             - { name: knp_menu.menu, alias: user_menu }
 
     packagist.menu.profile:
+        public: true
         class: Knp\Menu\MenuItem
         factory: ['@packagist.menu_builder', createProfileMenu]
         tags:
             - { name: knp_menu.menu, alias: profile_menu }
 
     packagist.algolia.client:
+        public: true
         class: AlgoliaSearch\Client
         arguments: ['%algolia.app_id%', '%algolia.admin_key%']
 
     packagist.queue_worker:
+        public: true
         class: Packagist\WebBundle\Service\QueueWorker
         arguments:
-            - "@packagist.log_resetter"
             - "@snc_redis.default_client"
             - "@doctrine"
             - "@logger"
@@ -156,30 +186,24 @@ services:
               'githubuser:migrate': '@github_user_migration_worker'
 
     scheduler:
+        public: true
         class: Packagist\WebBundle\Service\Scheduler
         arguments: ["@snc_redis.default_client", "@doctrine"]
 
     locker:
+        public: true
         class: Packagist\WebBundle\Service\Locker
         arguments: ["@doctrine"]
 
     updater_worker:
+        public: true
         class: Packagist\WebBundle\Service\UpdaterWorker
         arguments: ["@logger", "@doctrine", "@packagist.package_updater", "@locker", "@scheduler", "@packagist.package_manager", "@packagist.download_manager"]
 
     github_user_migration_worker:
+        public: true
         class: Packagist\WebBundle\Service\GitHubUserMigrationWorker
         arguments: ["@logger", "@doctrine", "@guzzle_client", "%github.webhook_secret%"]
 
-    packagist.log_resetter:
-        class: Packagist\WebBundle\Service\LogResetter
-        arguments: ['@service_container', '%fingers_crossed_handlers%']
-
-    packagist.console_stack_trace_line_formatter:
-        class: Symfony\Bridge\Monolog\Formatter\ConsoleFormatter
-        arguments: []
-        calls:
-          - [includeStacktraces, [true]]
-
 parameters:
     security.exception_listener.class: Packagist\WebBundle\Security\ExceptionListener

src/Packagist/WebBundle/Resources/views/Explore/popular.html.twig → src/Packagist/WebBundle/Resources/views/explore/popular.html.twig

@@ -1,4 +1,4 @@
-{% embed "PackagistWebBundle:Web:list.html.twig" %}
+{% embed "PackagistWebBundle:web:list.html.twig" %}
     {% block content_title %}
         <h2 class="title">{{ 'explore.popularpackages'|trans }}</h2>
     {% endblock %}

src/Packagist/WebBundle/Resources/views/layout.html.twig

@@ -110,7 +110,7 @@
             </nav>
         </header>
 
-        {{ include("PackagistWebBundle:Web:searchSection.html.twig", {showSearchDesc: showSearchDesc|default('show')}) }}
+        {{ include("PackagistWebBundle:web:search_section.html.twig", {showSearchDesc: showSearchDesc|default('show')}) }}
 
         {% block flashMessages %}
             {%- if app.session.flashbag.peekAll()|length > 0 %}

src/Packagist/WebBundle/Resources/views/Package/dependents.html.twig → src/Packagist/WebBundle/Resources/views/package/dependents.html.twig

@@ -20,7 +20,7 @@
 
     <section class="row">
         <section class="col-md-12">
-        {% embed "PackagistWebBundle:Web:list.html.twig" with {noLayout: 'true', showAutoUpdateWarning: false} %}
+        {% embed "PackagistWebBundle:web:list.html.twig" with {noLayout: 'true', showAutoUpdateWarning: false} %}
             {% block content_title %}
             {% endblock %}
         {% endembed %}

src/Packagist/WebBundle/Resources/views/Package/providers.html.twig → src/Packagist/WebBundle/Resources/views/package/providers.html.twig

@@ -1,3 +1,3 @@
-{% extends "PackagistWebBundle:Web:list.html.twig" %}
+{% extends "PackagistWebBundle:web:list.html.twig" %}
 
 {% block content_title %}<h1>{{ 'packages.providers_title'|trans({ '%name%': name }) }}</h1>{% endblock %}

src/Packagist/WebBundle/Resources/views/Package/stats.html.twig → src/Packagist/WebBundle/Resources/views/package/stats.html.twig

@@ -61,7 +61,7 @@
                         </svg>
                     </div>
                 </div>
-                {% include 'PackagistWebBundle:Package:versionList.html.twig' with {versions: versions, expandedId: expandedId} %}
+                {% include 'PackagistWebBundle:package:version_list.html.twig' with {versions: versions, expandedId: expandedId} %}
             </div>
         </div>
     </section>

src/Packagist/WebBundle/Resources/views/Package/suggesters.html.twig → src/Packagist/WebBundle/Resources/views/package/suggesters.html.twig

@@ -20,7 +20,7 @@
 
     <section class="row">
         <section class="col-md-12">
-            {% embed "PackagistWebBundle:Web:list.html.twig" with {noLayout: 'true', showAutoUpdateWarning: false} %}
+            {% embed "PackagistWebBundle:web:list.html.twig" with {noLayout: 'true', showAutoUpdateWarning: false} %}
                 {% block content_title %}
                 {% endblock %}
             {% endembed %}

src/Packagist/WebBundle/Resources/views/Package/viewPackage.html.twig → src/Packagist/WebBundle/Resources/views/package/view_package.html.twig

@@ -273,10 +273,10 @@
             <div class="row versions-section">
                 <div class="version-details col-md-9">
                     {% if expandedVersion %}
-                        {% include 'PackagistWebBundle:Package:versionDetails.html.twig' with {version: expandedVersion} %}
+                        {% include 'PackagistWebBundle:package:version_details.html.twig' with {version: expandedVersion} %}
                     {% endif %}
                 </div>
-                {% include 'PackagistWebBundle:Package:versionList.html.twig' with {versions: versions, expandedId: expandedVersion.id, deleteVersionCsrfToken: deleteVersionCsrfToken|default(null)} %}
+                {% include 'PackagistWebBundle:package:version_list.html.twig' with {versions: versions, expandedId: expandedVersion.id, deleteVersionCsrfToken: deleteVersionCsrfToken|default(null)} %}
             {% elseif package.crawledAt is null %}
                 <p class="col-xs-12">This package has not been crawled yet, some information is missing.</p>
             {% else %}

src/Packagist/WebBundle/Resources/views/Package/viewVendor.html.twig → src/Packagist/WebBundle/Resources/views/package/view_vendor.html.twig

@@ -1,4 +1,4 @@
-{% extends "PackagistWebBundle:Web:list.html.twig" %}
+{% extends "PackagistWebBundle:web:list.html.twig" %}
 
 {% block head_feeds %}
     <link rel="alternate" type="application/rss+xml" title="New Releases - {{ vendor }}" href="{{ url('feed_vendor', {vendor: vendor, _format: 'rss'}) }}" />

src/Packagist/WebBundle/Resources/views/User/favorites.html.twig → src/Packagist/WebBundle/Resources/views/user/favorites.html.twig

@@ -1,4 +1,4 @@
-{% extends "PackagistWebBundle:User:packages.html.twig" %}
+{% extends "PackagistWebBundle:user:packages.html.twig" %}
 
 {% import "PackagistWebBundle::macros.html.twig" as macros %}
 
@@ -25,7 +25,7 @@
     {% endif %}
 
     <section class="{{ isActualUser ? 'col-md-9' : 'col-md-12' }}">
-        {% embed "PackagistWebBundle:Web:list.html.twig" with {noLayout: 'true', showAutoUpdateWarning: isActualUser} %}
+        {% embed "PackagistWebBundle:web:list.html.twig" with {noLayout: 'true', showAutoUpdateWarning: isActualUser} %}
             {% block content_title %}
                 <h3 class="font-normal profile-title">{{ (isActualUser ? 'packages.my_favorites' : 'packages.users_favorites')|trans({ '%user%': user.username }) }}</h3>
             {% endblock %}

src/Packagist/WebBundle/Resources/views/User/packages.html.twig → src/Packagist/WebBundle/Resources/views/user/packages.html.twig

@@ -25,7 +25,7 @@
     {% endif %}
 
     <section class="{{ isActualUser ? 'col-md-9' : 'col-md-12' }}">
-        {% embed "PackagistWebBundle:Web:list.html.twig" with {noLayout: 'true', showAutoUpdateWarning: isActualUser} %}
+        {% embed "PackagistWebBundle:web:list.html.twig" with {noLayout: 'true', showAutoUpdateWarning: isActualUser} %}
             {% block content_title %}
                 <h3 class="font-normal profile-title">{{ (isActualUser ? 'packages.mine' : 'packages.maintained_by')|trans({ '%user%': user.username }) }}</h3>
             {% endblock %}

src/Packagist/WebBundle/Resources/views/User/profile.html.twig → src/Packagist/WebBundle/Resources/views/user/profile.html.twig

@@ -26,7 +26,7 @@
 
 <section class="row">
     <section class="col-md-12">
-        {% embed "PackagistWebBundle:Web:list.html.twig" with {noLayout: 'true', showAutoUpdateWarning: isActualUser} %}
+        {% embed "PackagistWebBundle:web:list.html.twig" with {noLayout: 'true', showAutoUpdateWarning: isActualUser} %}
             {% block content_title %}
                 <h3 class="font-normal profile-title">{{ 'user.packages'|trans({ '%username%':user.username }) }}</h3>
             {% endblock %}

src/Packagist/WebBundle/Resources/views/Web/search.html.twig → src/Packagist/WebBundle/Resources/views/web/search.html.twig

@@ -1,4 +1,4 @@
-{% embed "PackagistWebBundle:Web:list.html.twig" %}
+{% embed "PackagistWebBundle:web:list.html.twig" %}
     {% block content %}
     {% endblock %}
 {% endembed %}

src/Packagist/WebBundle/Service/LogResetter.php

@@ -1,32 +0,0 @@
-<?php declare(strict_types=1);
-
-namespace Packagist\WebBundle\Service;
-
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Monolog\Handler\FingersCrossedHandler;
-
-class LogResetter
-{
-    private $handlers;
-
-    public function __construct(ContainerInterface $container, array $fingersCrossedHandlerNames)
-    {
-        $this->handlers = [];
-
-        foreach ($fingersCrossedHandlerNames as $name) {
-            $handler = $container->get('monolog.handler.'.$name);
-            if (!$handler instanceof FingersCrossedHandler) {
-                throw new \RuntimeException('Misconfiguration: '.$name.' given as a fingers_crossed handler type but '.get_class($handler).' was found');
-            }
-
-            $this->handlers[] = $handler;
-        }
-    }
-
-    public function reset()
-    {
-        foreach ($this->handlers as $handler) {
-            $handler->clear();
-        }
-    }
-}

src/Packagist/WebBundle/Service/QueueWorker.php

@@ -7,11 +7,9 @@ use Psr\Log\LoggerInterface;
 use Symfony\Bridge\Doctrine\RegistryInterface;
 use Packagist\WebBundle\Entity\Job;
 use Seld\Signal\SignalHandler;
-use Packagist\WebBundle\Service\LogResetter;
 
 class QueueWorker
 {
-    private $logResetter;
     private $redis;
     private $logger;
     /** @var RegistryInterface */
@@ -19,9 +17,8 @@ class QueueWorker
     private $jobWorkers;
     private $processedJobs = 0;
 
-    public function __construct(LogResetter $logResetter, Redis $redis, RegistryInterface $doctrine, LoggerInterface $logger, array $jobWorkers)
+    public function __construct(Redis $redis, RegistryInterface $doctrine, LoggerInterface $logger, array $jobWorkers)
     {
-        $this->logResetter = $logResetter;
         $this->redis = $redis;
         $this->logger = $logger;
         $this->doctrine = $doctrine;
@@ -109,9 +106,7 @@ class QueueWorker
 
         $processor = $this->jobWorkers[$job->getType()];
 
-        // clears/resets all fingers-crossed handlers to avoid dumping info messages that happened between two job executions
-        $this->logResetter->reset();
-
+        $this->logger->reset();
         $this->logger->debug('Processing ' . $job->getType() . ' job', ['job' => $job->getPayload()]);
 
         try {
@@ -138,8 +133,7 @@ class QueueWorker
             $job->reschedule($result['after']);
             $em->flush($job);
 
-            // reset logger
-            $this->logResetter->reset();
+            $this->logger->reset();
             $this->logger->popProcessor();
 
             return true;
@@ -172,9 +166,7 @@ class QueueWorker
             $this->logger->error('Job '.$job->getId().' errored', $result);
         }
 
-        // clears/resets all fingers-crossed handlers so that if one triggers it doesn't dump the entire debug log for all processed
-        $this->logResetter->reset();
-
+        $this->logger->reset();
         $this->logger->popProcessor();
 
         return true;

web/app.php

@@ -6,10 +6,7 @@ use Symfony\Component\HttpFoundation\Request;
  * @var \Symfony\Component\ClassLoader\ClassLoader
  */
 $loader = require __DIR__.'/../app/autoload.php';
-include_once __DIR__.'/../app/bootstrap.php.cache';
-
 $kernel = new AppKernel('prod', false);
-$kernel->loadClassCache();
 
 if (in_array($_SERVER['REMOTE_ADDR'], ['144.217.203.53', '54.38.136.239', '54.37.131.18', '142.44.164.249', '142.44.164.255', '54.37.2.184', '139.99.121.122', '54.37.4.73', '51.38.227.34'], true)) {
     Request::setTrustedProxies([$_SERVER['REMOTE_ADDR']]);

web/app_dev.php

@@ -27,7 +27,6 @@ $loader = require_once __DIR__.'/../app/autoload.php';
 Debug::enable();
 
 $kernel = new AppKernel('dev', true);
-$kernel->loadClassCache();
 $request = Request::createFromGlobals();
 $response = $kernel->handle($request);
 $response->send();