Merge pull request #1588 from XWB/doctrine-deprecation

Fix Doctrine deprecation notice in RegisterListenersService

Author: XWB

.travis.yml

@@ -25,16 +25,19 @@ matrix:
       env: COVERAGE=true PHPUNIT_FLAGS="-v --coverage-clover=coverage.clover"
 
     # Install all SF components in the same major version, see https://github.com/dunglas/symfony-lock
-    - php: 7.3
-      env: SYMFONY_VERSION="^4"
+    - php: 7.4
+      env: DEPENDENCIES="symfony/flex" SYMFONY_VERSION="^3.4"
+    - php: 7.4
+      env: DEPENDENCIES="symfony/flex" SYMFONY_VERSION="^4.4"
 
 before_install:
   - if [[ $COVERAGE != true ]]; then phpenv config-rm xdebug.ini || true; fi
 
 install:
   # To be removed when this issue will be resolved: https://github.com/composer/composer/issues/5355
   - if [[ "$COMPOSER_FLAGS" == *"--prefer-lowest"* ]]; then composer update --prefer-dist --no-interaction --prefer-stable --quiet; fi
-  - if [ "$SYMFONY_VERSION" != "" ]; then composer require --dev --no-update dunglas/symfony-lock=$SYMFONY_VERSION; fi;
+  - if [ "$DEPENDENCIES" != "" ]; then composer require --no-update ${DEPENDENCIES}; fi;
+  - if [ "$SYMFONY_VERSION" != "" ]; then composer config extra.symfony.require ${SYMFONY_VERSION}; fi;
   - composer update ${COMPOSER_FLAGS} --prefer-dist --no-interaction
   - mkdir /tmp/elasticsearch
   - wget -O - https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}.tar.gz | tar xz --directory=/tmp/elasticsearch --strip-components=1
@@ -44,7 +47,7 @@ install:
 
 before_script:
   - phpenv config-add .travis/php.ini
-  - if [ "$TRAVIS_PHP_VERSION" = "7.1" ]; then echo "extension = mongodb.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;
+  - echo "extension = mongodb.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
 
 script:
   - vendor/bin/phpunit ${PHPUNIT_FLAGS}

composer.json

@@ -24,6 +24,7 @@
     "require-dev": {
         "doctrine/orm": "^2.5",
         "doctrine/doctrine-bundle": "^1.6",
+        "doctrine/persistence": "^1.3.3",
         "doctrine/phpcr-bundle": "^1.3|^2.0",
         "doctrine/phpcr-odm": "^1.4",
         "jackalope/jackalope-doctrine-dbal": "^1.2",

src/Doctrine/RegisterListenersService.php

@@ -1,9 +1,19 @@
 <?php
+
+/*
+ * This file is part of the FOSElasticaBundle package.
+ *
+ * (c) FriendsOfSymfony <http://friendsofsymfony.github.com/>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace FOS\ElasticaBundle\Doctrine;
 
-use Doctrine\Common\Persistence\ObjectManager;
 use Doctrine\ODM\MongoDB\DocumentManager;
 use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\Persistence\ObjectManager;
 use FOS\ElasticaBundle\Persister\Event\Events;
 use FOS\ElasticaBundle\Persister\Event\PersistEvent;
 use FOS\ElasticaBundle\Provider\PagerInterface;
@@ -46,10 +56,10 @@ public function register(ObjectManager $manager, PagerInterface $pager, array $o
             });
         }
 
-        if (false == $options['debug_logging'] && $manager instanceof EntityManagerInterface) {
+        if (false === $options['debug_logging'] && $manager instanceof EntityManagerInterface) {
             $configuration = $manager->getConnection()->getConfiguration();
             $logger = $configuration->getSQLLogger();
-            
+
             $this->addListener($pager, Events::PRE_FETCH_OBJECTS, function() use ($configuration) {
                 $configuration->setSQLLogger(null);
             });
@@ -59,7 +69,7 @@ public function register(ObjectManager $manager, PagerInterface $pager, array $o
             });
         }
 
-        if (false == $options['debug_logging'] && $manager instanceof DocumentManager) {
+        if (false === $options['debug_logging'] && $manager instanceof DocumentManager) {
             $configuration = $manager->getConnection()->getConfiguration();
             $logger = $configuration->getLoggerCallable();
 

tests/Functional/ProfilerTest.php

@@ -21,6 +21,9 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
+use Twig\Loader\FilesystemLoader;
+use Twig\Environment;
+use Twig\RuntimeLoader\RuntimeLoaderInterface;
 
 /**
  * @group functional
@@ -30,7 +33,7 @@ class ProfilerTest extends WebTestCase
     /** @var ElasticaLogger */
     private $logger;
 
-    /** @var \Twig_Environment */
+    /** @var Environment */
     private $twig;
 
     /** @var ElasticaDataCollector */
@@ -41,15 +44,15 @@ public function setUp()
         $this->logger = new ElasticaLogger($this->createMock(LoggerInterface::class), true);
         $this->collector = new ElasticaDataCollector($this->logger);
 
-        $twigLoaderFilesystem = new \Twig_Loader_Filesystem(__DIR__ . '/../../src/Resources/views/Collector');
+        $twigLoaderFilesystem = new FilesystemLoader(__DIR__ . '/../../src/Resources/views/Collector');
         $twigLoaderFilesystem->addPath(__DIR__ . '/../../vendor/symfony/web-profiler-bundle/Resources/views', 'WebProfiler');
-        $this->twig = new \Twig_Environment($twigLoaderFilesystem, ['debug' => true, 'strict_variables' => true]);
+        $this->twig = new Environment($twigLoaderFilesystem, ['debug' => true, 'strict_variables' => true]);
 
         $this->twig->addExtension(new CodeExtension('', '', ''));
         $this->twig->addExtension(new RoutingExtension($this->getMockBuilder(UrlGeneratorInterface::class)->getMock()));
         $this->twig->addExtension(new HttpKernelExtension($this->getMockBuilder(FragmentHandler::class)->disableOriginalConstructor()->getMock()));
 
-        $loader = $this->getMockBuilder(\Twig_RuntimeLoaderInterface::class)->getMock();
+        $loader = $this->getMockBuilder(RuntimeLoaderInterface::class)->getMock();
         $loader->method('load')->willReturn($this->getMockBuilder(HttpKernelRuntime::class)->disableOriginalConstructor()->getMock());
         $this->twig->addRuntimeLoader($loader);
     }