Merge pull request #204 from alexander-schranz/enhancement/symfony-5-support

Add symfony 5 support

Author: dantleech

.gitignore

@@ -1,3 +1,4 @@
 vendor
 composer.lock
 phpcr.phar
+.phpunit.result.cache

.travis.yml

@@ -1,75 +1,39 @@
 language: php
+dist: trusty
 
 matrix:
   include:
-    - php: 5.6
+    - php: 7.2
       env:
         - PREFER="--prefer-lowest"
         - BEHAT_SUITE=standalone
-        - SYMFONY_VERSION=^2.8
-    - php: 5.6
+    - php: 7.2
       env:
         - PREFER="--prefer-lowest"
         - BEHAT_SUITE=embedded
-        - SYMFONY_VERSION=^3.0
-    - php: 5.6
+    - php: 7.2
       env:
         - PREFER="--prefer-lowest"
         - BEHAT_SUITE=cli
-        - SYMFONY_VERSION=^3.0
-    - php: 7.0
-      env:
-        - PREFER=""
-        - BEHAT_SUITE=standalone
-        - SYMFONY_VERSION=^2.8
-    - php: 7.0
-      env:
-        - PREFER=""
-        - BEHAT_SUITE=embedded
-        - SYMFONY_VERSION=^3.0
-    - php: 7.0
-      env:
-        - PREFER=""
-        - BEHAT_SUITE=cli
-        - SYMFONY_VERSION=^3.0
-    - php: 7.1
+    - php: 7.4
       env:
         - PREFER=""
         - BEHAT_SUITE=standalone
-        - SYMFONY_VERSION=^2.8
-    - php: 7.1
+    - php: 7.4
       env:
         - PREFER=""
         - BEHAT_SUITE=embedded
-        - SYMFONY_VERSION=^3.4
-    - php: 7.1
-      env:
-        - PREFER=""
-        - BEHAT_SUITE=cli
-        - SYMFONY_VERSION=^4.0
-    - php: 7.2
-      env:
-        - PREFER=""
-        - BEHAT_SUITE=standalone
-        - SYMFONY_VERSION=^2.8
-    - php: 7.2
-      env:
-        - PREFER=""
-        - BEHAT_SUITE=embedded
-        - SYMFONY_VERSION=^3.0
-    - php: 7.2
+    - php: 7.4
       env:
         - PREFER=""
         - BEHAT_SUITE=cli
-        - SYMFONY_VERSION=^4.0
 
 before_script:
     - composer self-update
-    - composer require "symfony/symfony" "$SYMFONY_VERSION" --no-update
     - composer update $PREFER
     - bash tests/bin/travis_jackrabbit.sh
 
-script: 
-  - phpunit
+script:
+  - vendor/bin/phpunit
   - php vendor/bin/phpspec run
   - php vendor/behat/behat/bin/behat --suite=$BEHAT_SUITE

composer.json

@@ -2,25 +2,25 @@
     "name": "phpcr/phpcr-shell",
     "description": "Shell for PHPCR",
     "require": {
-        "php": "^5.6|^7.0",
-        "symfony/console": "~2.8|~3.0|~4.0",
-        "jackalope/jackalope": "~1.1",
-        "phpcr/phpcr": "~2.1",
-        "phpcr/phpcr-utils": "~1.2", 
-        "symfony/finder": "~2.8|~3.0|~4.0",
-        "symfony/serializer": "~2.8|~3.0|~4.0",
-        "symfony/yaml": "~2.8|~3.0|~4.0",
-        "symfony/dependency-injection": "~2.8|~3.0|~4.0",
-        "symfony/expression-language": "~2.8|~3.0|~4.0",
-        "dantleech/glob-finder": "~1.0"
+        "php": "^7.2",
+        "symfony/console": "^5.0",
+        "jackalope/jackalope": "^1.3.4",
+        "phpcr/phpcr": "^2.1",
+        "phpcr/phpcr-utils": "^1.2",
+        "symfony/finder": "^5.0",
+        "symfony/serializer": "^5.0",
+        "symfony/yaml": "^5.0",
+        "symfony/dependency-injection": "^5.0",
+        "symfony/expression-language": "^5.0",
+        "dantleech/glob-finder": "^1.0"
     },
     "require-dev": {
-        "symfony/symfony": "~2.8|~3.0|~4.0",
-        "phpunit/phpunit": "~5.7",
-        "behat/behat": "~3.1",
-        "phpspec/phpspec": "~3.2|~4.0",
-        "jackalope/jackalope-doctrine-dbal": "~1.2",
-        "jackalope/jackalope-jackrabbit": "~1.2"
+        "phpunit/phpunit": "^8.5",
+        "symfony/symfony": "^5.0",
+        "behat/behat": "^3.6",
+        "phpspec/phpspec": "^6.0",
+        "jackalope/jackalope-doctrine-dbal": "^1.3",
+        "jackalope/jackalope-jackrabbit": "^1.3"
     },
     "suggest": {
         "jackalope/jackalope-doctrine-dbal": "To connect to jackalope doctrine-dbal",

src/PHPCR/Shell/Console/Application/ShellApplication.php

@@ -12,7 +12,6 @@
 
 namespace PHPCR\Shell\Console\Application;
 
-use PHPCR\Shell\Config\Profile;
 use PHPCR\Shell\Console\Command\Phpcr as CommandPhpcr;
 use PHPCR\Shell\Console\Command\Phpcr\BasePhpcrCommand;
 use PHPCR\Shell\Console\Command\Shell as CommandShell;
@@ -57,6 +56,11 @@ class ShellApplication extends Application
      */
     protected $initialized = false;
 
+    /**
+     * @var EventDispatcher
+     */
+    private $dispatcher;
+
     /**
      * Constructor - name and version inherited from SessionApplication.
      *
@@ -95,7 +99,7 @@ public function init()
         $this->registerShellCommands();
 
         $event = new ApplicationInitEvent($this);
-        $this->dispatcher->dispatch(PhpcrShellEvents::APPLICATION_INIT, $event);
+        $this->dispatcher->dispatch($event, PhpcrShellEvents::APPLICATION_INIT);
         $this->initialized = true;
     }
 
@@ -242,7 +246,7 @@ public function doRun(InputInterface $input, OutputInterface $output)
         $name = $this->getCommandName($input);
 
         $event = new Event\CommandPreRunEvent($name, $input);
-        $this->dispatcher->dispatch(PhpcrShellEvents::COMMAND_PRE_RUN, $event);
+        $this->dispatcher->dispatch($event, PhpcrShellEvents::COMMAND_PRE_RUN);
         $input = $event->getInput();
 
         if (!$name) {
@@ -252,7 +256,7 @@ public function doRun(InputInterface $input, OutputInterface $output)
         try {
             $exitCode = parent::doRun($input, $output);
         } catch (\Exception $e) {
-            $this->dispatcher->dispatch(PhpcrShellEvents::COMMAND_EXCEPTION, new Event\CommandExceptionEvent($e, $this, $output));
+            $this->dispatcher->dispatch(new Event\CommandExceptionEvent($e, $this, $output), PhpcrShellEvents::COMMAND_EXCEPTION);
 
             return 1;
         }
@@ -292,7 +296,7 @@ public function add(Command $command)
     public function dispatchProfileInitEvent(InputInterface $sessionInput, OutputInterface $output)
     {
         $event = new Event\ProfileInitEvent($this->container->get('config.profile'), $sessionInput, $output);
-        $this->dispatcher->dispatch(PhpcrShellEvents::PROFILE_INIT, $event);
+        $this->dispatcher->dispatch($event, PhpcrShellEvents::PROFILE_INIT);
     }
 
     /**

src/PHPCR/Shell/Console/Command/Phpcr/AccessControlPrivilegeListCommand.php

@@ -73,5 +73,7 @@ public function execute(InputInterface $input, OutputInterface $output)
         foreach ($privileges as $privilege) {
             $table->addRow([$privilege->getName()]);
         }
+
+        return 0;
     }
 }

src/PHPCR/Shell/Console/Command/Phpcr/LockInfoCommand.php

@@ -64,5 +64,7 @@ public function execute(InputInterface $input, OutputInterface $output)
         }
 
         $table->render($output);
+
+        return 0;
     }
 }

src/PHPCR/Shell/Console/Command/Phpcr/LockLockCommand.php

@@ -79,5 +79,7 @@ public function execute(InputInterface $input, OutputInterface $output)
         $ownerInfo = $input->getOption('owner-info');
 
         $lockManager->lock($path, $isDeep, $isSessionScoped, $timeout, $ownerInfo);
+
+        return 0;
     }
 }

src/PHPCR/Shell/Console/Command/Phpcr/LockRefreshCommand.php

@@ -13,7 +13,6 @@
 namespace PHPCR\Shell\Console\Command\Phpcr;
 
 use PHPCR\RepositoryInterface;
-use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -50,5 +49,7 @@ public function execute(InputInterface $input, OutputInterface $output)
             $lock = $lockManager->getLock($node->getPath());
             $lock->refresh();
         }
+
+        return 0;
     }
 }

src/PHPCR/Shell/Console/Command/Phpcr/LockTokenAddCommand.php

@@ -43,5 +43,7 @@ public function execute(InputInterface $input, OutputInterface $output)
         $lockToken = $input->getArgument('lockToken');
 
         $lockManager->addLockToken($lockToken);
+
+        return 0;
     }
 }

src/PHPCR/Shell/Console/Command/Phpcr/LockTokenListCommand.php

@@ -51,5 +51,7 @@ public function execute(InputInterface $input, OutputInterface $output)
         }
 
         $table->render($output);
+
+        return 0;
     }
 }