Merge pull request #60 from winzou/sf5

Add Symfony5 support
winzou · Jul 26, 2020 · c9522d5 · c9522d5
2 parents 70a2e91 + 81bd972
commit c9522d5
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 40 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,28 +6,21 @@ dist: xenial
 language: php
 
 php:
-    - 5.6
-    - hhvm
-    - 7.0
     - 7.1
     - 7.2
 
 env:
-   - SYMFONY_VERSION=~2.1
-   - SYMFONY_VERSION=~3.0
    - SYMFONY_VERSION=~4.0
+   - SYMFONY_VERSION=~5.0
 
 matrix:
-  fast_finish: true
   allow_failures:
-    - php: 5.6
-      env: 'SYMFONY_VERSION=~4.0'
-    - php: 7.0
-      env: 'SYMFONY_VERSION=~4.0'
-    - php: hhvm
-      env: 'SYMFONY_VERSION=~4.0'
-    - php: hhvm
-      dist: xenial
+    - php: 7.1
+      env: 'SYMFONY_VERSION=~5.0'
+
+before_install:
+    - phpenv config-rm xdebug.ini || true
+    - echo "memory_limit=4096M" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
 
 before_script:
     - composer self-update

diff --git a/Callback/ContainerAwareCallbackFactory.php b/Callback/ContainerAwareCallbackFactory.php
@@ -13,6 +13,7 @@
 
 use SM\SMException;
 use SM\Callback\CallbackFactory;
+use SM\Callback\CallbackInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 class ContainerAwareCallbackFactory extends CallbackFactory
@@ -32,7 +33,7 @@ public function __construct($class, ContainerInterface $container)
     /**
      * {@inheritDoc}
      */
-    public function get(array $specs)
+    public function get(array $specs): CallbackInterface
     {
         if (!isset($specs['do'])) {
             throw new SMException(sprintf(

diff --git a/Command/winzouStateMachineDebugCommand.php b/Command/winzouStateMachineDebugCommand.php
@@ -2,30 +2,35 @@
 
 namespace winzou\Bundle\StateMachineBundle\Command;
 
-use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
+use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Helper\TableSeparator;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Helper\Table;
 use Symfony\Component\Console\Question\ChoiceQuestion;
 
-class winzouStateMachineDebugCommand extends ContainerAwareCommand
+class winzouStateMachineDebugCommand extends Command
 {
     protected static $defaultName = 'debug:winzou:state-machine';
 
-    /**
-     * @var array
-     */
+    /** @var array */
     protected $config;
 
+    public function __construct(array $config)
+    {
+        parent::__construct();
+
+        $this->config = $config;
+    }
+
     /**
      * {@inheritdoc}
      */
     public function configure()
     {
         $this
-            ->setName(self::$defaultName) // BC with 2.7
+            ->setDescription('Shows information about state machine states, transitions and callbacks.')
             ->addArgument('key', InputArgument::REQUIRED, 'A state machine key')
         ;
     }
@@ -35,8 +40,6 @@ public function configure()
      */
     protected function initialize(InputInterface $input, OutputInterface $output)
     {
-        $this->config = $this->getContainer()->getParameter('sm.configs');
-
         if (empty($this->config)) {
             throw new \RuntimeException('There is no state machine configured.');
         }
@@ -89,6 +92,8 @@ public function execute(InputInterface $input, OutputInterface $output)
         if (isset($config['callbacks'])) {
             $this->printCallbacks($config['callbacks'], $output);
         }
+
+        return 0;
     }
 
     /**

diff --git a/DependencyInjection/winzouStateMachineExtension.php b/DependencyInjection/winzouStateMachineExtension.php
@@ -13,8 +13,8 @@
 
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Extension\Extension;
 use Symfony\Component\DependencyInjection\Loader;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
 class winzouStateMachineExtension extends Extension
 {

diff --git a/Resources/config/services.yml b/Resources/config/services.yml
@@ -26,6 +26,6 @@ services:
         arguments:
             $class: "%sm.callback.class%"
 
-    winzou\Bundle\StateMachineBundle\Command\:
-        resource: "../../Command/*"
-        tags: ["console.command"]
+    winzou\Bundle\StateMachineBundle\Command\winzouStateMachineDebugCommand:
+        arguments:
+            $config: "%sm.configs%"
diff --git a/composer.json b/composer.json
@@ -11,12 +11,12 @@
         }
     ],
     "require": {
-        "php":                      ">5.3.0",
-        "winzou/state-machine":     "~0.3",
-        "symfony/framework-bundle": "~2.1|~3.0|^4.0"
+        "php":                      "^7.1.3",
+        "winzou/state-machine":     "~0.4",
+        "symfony/framework-bundle": "^4.3|^5.0"
     },
     "require-dev": {
-        "phpspec/phpspec": "~2.0"
+        "phpspec/phpspec": "^5.0|^6.0"
     },
     "autoload": {
         "psr-4": { "winzou\\Bundle\\StateMachineBundle\\": "" }

diff --git a/spec/winzou/Bundle/StateMachineBundle/Callback/ContainerAwareCallbackSpec.php b/spec/winzou/Bundle/StateMachineBundle/Callback/ContainerAwareCallbackSpec.php
@@ -3,10 +3,10 @@
 namespace spec\winzou\Bundle\StateMachineBundle\Callback;
 
 use PhpSpec\ObjectBehavior;
-use Prophecy\Argument;
 use SM\Event\TransitionEvent;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
+use winzou\Bundle\StateMachineBundle\Callback\ContainerAwareCallback;
 
 class ContainerAwareCallbackSpec extends ObjectBehavior
 {
@@ -17,7 +17,7 @@ function let(ContainerInterface $container)
 
     function it_is_initializable()
     {
-        $this->shouldHaveType('winzou\Bundle\StateMachineBundle\Callback\ContainerAwareCallback');
+        $this->shouldHaveType(ContainerAwareCallback::class);
     }
 
     function it_converts_servicename_to_class($container, TransitionEvent $event, ContainerAwareCallbackSpec $service)
@@ -46,9 +46,9 @@ function it_converts_classname_to_class($container, TransitionEvent $event, Cont
 
     function it_allows_static_calls($container, TransitionEvent $event)
     {
-        $this->beConstructedWith(array(), array('spec\\winzou\\Bundle\\StateMachineBundle\\Callback\\ContainerAwareCallbackSpec', 'dummyStatic'), $container);
+        $this->beConstructedWith(array(), array(ContainerAwareCallbackSpec::class, 'dummyStatic'), $container);
 
-        $container->has('spec\\winzou\\Bundle\\StateMachineBundle\\Callback\\ContainerAwareCallbackSpec')->willReturn(false);
+        $container->has(ContainerAwareCallbackSpec::class)->willReturn(false);
 
         $this->call($event)->shouldReturn(2);
     }
@@ -58,9 +58,9 @@ function it_throws_an_exception_when_relevant($container, TransitionEvent $event
         $this->beConstructedWith(array(), array('@my_service', 'dummy'), $container);
 
         $container->has('my_service')->willReturn(false);
-        $container->get('my_service')->willThrow('Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException');
+        $container->get('my_service')->willThrow(ServiceNotFoundException::class);
 
-        $this->shouldThrow('Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException')->during('call', array($event));
+        $this->shouldThrow(ServiceNotFoundException::class)->during('call', array($event));
     }
 
     function dummy()

diff --git a/.../winzou/Bundle/StateMachineBundle/DependencyInjection/winzouStateMachineExtensionSpec.php b/.../winzou/Bundle/StateMachineBundle/DependencyInjection/winzouStateMachineExtensionSpec.php
@@ -3,9 +3,7 @@
 namespace spec\winzou\Bundle\StateMachineBundle\DependencyInjection;
 
 use PhpSpec\ObjectBehavior;
-use Prophecy\Argument;
 use Symfony\Component\Config\Definition\Processor;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use winzou\Bundle\StateMachineBundle\DependencyInjection\Configuration;
 use winzou\Bundle\StateMachineBundle\DependencyInjection\winzouStateMachineExtension;
 
@@ -110,7 +108,7 @@ class winzouStateMachineExtensionSpec extends ObjectBehavior
 
     function it_is_initializable()
     {
-        $this->shouldHaveType('winzou\Bundle\StateMachineBundle\DependencyInjection\winzouStateMachineExtension');
+        $this->shouldHaveType(winzouStateMachineExtension::class);
     }
 
     function it_parse_configs()