Support for symfony 4 (#42)

* Support for syfmony 4

* adding more dependencies

* adding RC flag

* Using simple-phpunit

* Bugfixes

* Fixed tests

* bump versions

* Bugfix

* Added changelog

* Added nyholm reporter

* Bump min reqs

Author: Nyholm

.travis.yml

@@ -6,17 +6,10 @@ cache:
     directories:
         - $HOME/.composer/cache/files
 
-php:
-    - 7.0
-    - 7.1
-
 env:
     global:
         - TEST_COMMAND="composer test"
-    matrix:
-        - SYMFONY_VERSION=3.2.*
-        - SYMFONY_VERSION=2.8.*
-        - SYMFONY_VERSION=2.7.*
+        - SYMFONY_PHPUNIT_VERSION="6.3"
 
 branches:
     except:
@@ -25,18 +18,53 @@ branches:
 matrix:
     fast_finish: true
     include:
+          # Test with lowest dependencies
+        - php: 7.2
+          env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" SYMFONY_DEPRECATIONS_HELPER="weak"
         - php: 7.0
-          env: SYMFONY_VERSION="3.2.* graphaware/neo4j-php-ogm:^1.0" COVERAGE=true TEST_COMMAND="composer test-ci"
+          env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" SYMFONY_DEPRECATIONS_HELPER="weak"
+
+          # Test the latest stable release
         - php: 7.0
-          env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" SYMFONY_VERSION=2.7.*
+        - php: 7.1
+        - php: 7.2
+          env: COVERAGE=true TEST_COMMAND="composer test-ci" DEPENDENCIES="graphaware/neo4j-php-ogm:^1.0@rc"
+
+          # Force some major versions of Symfony
+        - php: 7.2
+          env: DEPENDENCIES="dunglas/symfony-lock:^2"
+        - php: 7.2
+          env: DEPENDENCIES="dunglas/symfony-lock:^3"
+        - php: 7.2
+          env: DEPENDENCIES="dunglas/symfony-lock:^4"
+
+          # Latest commit to master
+        - php: 7.2
+          env: STABILITY="dev"
+
+    allow_failures:
+          # Dev-master is allowed to fail.
+        - env: STABILITY="dev"
+
+before_install:
+    - if [[ $COVERAGE != true ]]; then phpenv config-rm xdebug.ini || true; fi
+    - if ! [ -z "$STABILITY" ]; then composer config minimum-stability ${STABILITY}; fi;
+    - if ! [ -z "$DEPENDENCIES" ]; then composer require --no-update ${DEPENDENCIES}; fi;
 
 install:
-    - composer require symfony/symfony:${SYMFONY_VERSION} --no-update
-    - travis_retry composer update ${COMPOSER_FLAGS} --prefer-dist --no-interaction
+    # 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
+    - composer update ${COMPOSER_FLAGS} --prefer-dist --no-interaction
+    - vendor/bin/simple-phpunit install
 
 script:
+    - composer validate --strict --no-check-lock
     - $TEST_COMMAND
 
 after_success:
-    - if [[ $COVERAGE = true ]]; then wget https://scrutinizer-ci.com/ocular.phar; fi
-    - if [[ $COVERAGE = true ]]; then php ocular.phar code-coverage:upload --format=php-clover build/coverage.xml; fi
+    - if [[ "$COVERAGE" = true ]]; then wget https://scrutinizer-ci.com/ocular.phar; fi
+    - if [[ "$COVERAGE" = true ]]; then php ocular.phar code-coverage:upload --format=php-clover build/coverage.xml; fi
+
+after_script:
+    - wget http://tnyholm.se/reporter.phar
+    - php reporter.phar build:upload

Changelog.md

@@ -2,6 +2,17 @@
 
 The change log describes what is "Added", "Removed", "Changed" or "Fixed" between each release. 
 
+## 0.4.0
+
+### Added
+
+- Support for Symfony 4
+
+### Fixed
+
+- Updating the twig path for symfony flex
+- Register an autoloader for proxies to avoid issues when unserializing
+
 ## 0.3.0
 
 ### Added

DependencyInjection/Neo4jExtension.php

@@ -10,6 +10,7 @@
 use GraphAware\Neo4j\Client\HttpDriver\Driver as HttpDriver;
 use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
 use Symfony\Component\Config\FileLocator;
+use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\DefinitionDecorator;
@@ -99,8 +100,12 @@ private function handleClients(array &$config, ContainerBuilder $container): arr
                 $connections[] = 'default';
             }
 
+            $definition = class_exists(ChildDefinition::class)
+                ? new ChildDefinition('neo4j.client.abstract')
+                : new DefinitionDecorator('neo4j.client.abstract');
+
             $container
-                ->setDefinition($serviceId, new DefinitionDecorator('neo4j.client.abstract'))
+                ->setDefinition($serviceId, $definition)
                 ->setArguments([$connections]);
         }
 
@@ -127,8 +132,13 @@ private function handleEntityMangers(array &$config, ContainerBuilder $container
                     $clientName
                 ));
             }
+
+            $definition = class_exists(ChildDefinition::class)
+                ? new ChildDefinition('neo4j.entity_manager.abstract')
+                : new DefinitionDecorator('neo4j.entity_manager.abstract');
+
             $container
-                ->setDefinition($serviceId, new DefinitionDecorator('neo4j.entity_manager.abstract'))
+                ->setDefinition($serviceId, $definition)
                 ->setArguments([
                     $container->getDefinition($clientServiceIds[$clientName]),
                     empty($data['cache_dir']) ? $container->getParameter('kernel.cache_dir').'/neo4j' : $data['cache_dir'],

Tests/Functional/app/AppKernel.php

@@ -4,6 +4,8 @@
 
 use Neo4j\Neo4jBundle\Neo4jBundle;
 use Symfony\Component\Config\Loader\LoaderInterface;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\HttpKernel\Kernel;
 
@@ -55,4 +57,26 @@ public function unserialize($config)
     {
         $this->__construct($config);
     }
+
+    protected function build(ContainerBuilder $container)
+    {
+        $container->addCompilerPass(new PublicServicesForFunctionalTestsPass());
+    }
+}
+
+class PublicServicesForFunctionalTestsPass implements CompilerPassInterface
+{
+    public function process(ContainerBuilder $container)
+    {
+        $aliases = [
+            'neo4j.connection',
+            'neo4j.client',
+            'neo4j.entity_manager',
+        ];
+        foreach ($aliases as $alias) {
+            if ($container->hasAlias($alias)) {
+                $container->getAlias($alias)->setPublic(true);
+            }
+        }
+    }
 }

Tests/Unit/Collector/Twig/Neo4jResultExtensionTest.php

@@ -4,11 +4,12 @@
 
 use GraphAware\Neo4j\Client\Formatter\Type\Node;
 use Neo4j\Neo4jBundle\Collector\Twig\Neo4jResultExtension;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @author Tobias Nyholm <[email protected]>
  */
-class Neo4jResultExtensionTest extends \PHPUnit_Framework_TestCase
+class Neo4jResultExtensionTest extends TestCase
 {
     public function testEmptyArray()
     {

composer.json

@@ -16,14 +16,16 @@
     ],
     "require": {
         "php": "^7.0",
+        "graphaware/neo4j-bolt": "^1.6",
         "graphaware/neo4j-php-client": "^4.6.4",
-        "symfony/framework-bundle": "^2.7 || ^3.0",
-        "graphaware/neo4j-bolt": "^1.6"
+        "symfony/dependency-injection": " ^2.8.3 || ^3.0.3 || ^4.0",
+        "symfony/framework-bundle": "^2.8.32 || ^3.0 || ^4.0",
+        "symfony/http-kernel": "^2.8 || ^3.0 || ^4.0",
+        "twig/twig": "^1.18 || ^2.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.4",
-        "symfony/symfony": "^2.7 || ^3.0",
-        "matthiasnoback/symfony-dependency-injection-test": "^1.0"
+        "symfony/phpunit-bridge": "^3.3 || ^4.0",
+        "matthiasnoback/symfony-dependency-injection-test": "^2.3"
     },
     "suggest": {
         "graphaware/neo4j-php-ogm": "To have EntityManager support"
@@ -33,9 +35,11 @@
             "Neo4j\\Neo4jBundle\\": ""
         }
     },
-    "scripts": {
-        "test": "vendor/bin/phpunit",
-        "test-ci": "vendor/bin/phpunit --coverage-text --coverage-clover=build/coverage.xml"
+    "config": {
+        "sort-packages": true
     },
-    "minimum-stability": "beta"
+    "scripts": {
+        "test": "vendor/bin/simple-phpunit",
+        "test-ci": "vendor/bin/simple-phpunit --coverage-text --coverage-clover=build/coverage.xml"
+    }
 }