Merge pull request #39 from terox/symfony4

Symfony4 support

Author: Brunty

.travis.yml

@@ -2,19 +2,15 @@ language: php
 sudo: false
 
 php:
-  - 5.5
-  - 5.6
-  - 7.0
-  - hhvm
+  - 7.1
+  - 7.2
 
 cache:
   directories:
     - $HOME/.composer/cache
 
 matrix:
   fast_finish: true
-  allow_failures:
-    - php: hhvm
 
 before_install:
   - composer selfupdate
@@ -31,9 +27,6 @@ install:
   - if [ "$DEPENDENCIES" == "low" ]; then composer update --prefer-lowest; fi;
   - composer require ramsey/uuid
 
-before_script:
-  - echo "<?php if (PHP_VERSION_ID >= 50400) echo ',@php5.4';" > php_version_tags.php
-
 script:
    - bin/phpspec run --format=pretty
    #- ./vendor/bin/phpunit --testdox

composer.json

@@ -11,15 +11,13 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "require": {
-        "php": ">=5.5.3",
-        "doctrine/common": "~2.2",
-        "doctrine/orm": "~2.2",
-        "symfony/polyfill-php70": "^1.3",
-        "symfony/security": "^2.8|^3.0",
-        "symfony/options-resolver": "^2.8|^3.0",
+        "php": ">=7.1",
+        "doctrine/orm": "^2.6",
+        "symfony/security": "^3.3|^4.0",
+        "symfony/options-resolver": "^3.0|^4.0",
         "ircmaxell/random-lib": "~1.0",
-        "symfony/dependency-injection": "^2.7|^3.3",
-        "symfony/config": "^2.7|^3.3"
+        "symfony/dependency-injection": "^3.3|^4.0",
+        "symfony/config": "^3.3|^4.0"
     },
     "suggest": {
         "ramsey/uuid": "To use the UUID generator you should require this package"

src/Vivait/StringGeneratorBundle/EventListener/GeneratorListener.php

@@ -28,11 +28,6 @@ class GeneratorListener
      */
     private $registry;
 
-    /**
-     * @var ContainerInterface
-     */
-    private $container;
-
     /**
      * Registry has been made nullable as injecting it causes circular references. Instead, the container is injected
      * via a setter, and the registry is fetched from there instead.
@@ -46,14 +41,6 @@ public function __construct(Reader $reader, Registry $registry = null)
         $this->registry = $registry;
     }
 
-    /**
-     * @param ContainerInterface $container
-     */
-    public function setContainer(ContainerInterface $container)
-    {
-        $this->container = $container;
-    }
-
     /**
      * @param LifecycleEventArgs $args
      */
@@ -92,7 +79,7 @@ public function prePersist(LifecycleEventArgs $args)
     private function generateString($property, GeneratorAnnotation $annotation, $entity)
     {
         /** @var GeneratorInterface|ConfigurableGeneratorInterface $generator */
-        $generator = $this->getRegistry()->get($annotation->generator);
+        $generator = $this->registry->get($annotation->generator);
 
         $generator->setLength($annotation->length);
 
@@ -168,15 +155,4 @@ private function isMethod($class, $callback)
     {
         return method_exists($class, $callback) && is_callable([$class, $callback]);
     }
-
-    /**
-     * @return Registry
-     */
-    private function getRegistry()
-    {
-        if($this->registry){
-            return $this->registry;
-        }
-        return $this->container->get('vivait_generator.registry');
-    }
 }

src/Vivait/StringGeneratorBundle/Resources/config/services.yml

@@ -2,9 +2,10 @@ services:
     vivait_generator.generator.listener:
         class: Vivait\StringGeneratorBundle\EventListener\GeneratorListener
         public: false
-        arguments: ["@annotation_reader"]
-        calls:
-            - [setContainer, ["@service_container"]]
+        arguments:
+            - "@annotation_reader"
+            - "@vivait_generator.registry"
+
         tags:
             - { name: doctrine.event_listener, event: prePersist }