syntax was updated to PHP 5.6 (::class string, short array syntax etc.)

was added PHPUnit to dev-dependencies

tests were updated to remove deprecations (please double-check it!!!)

+ BONUS: was added PHPStan to dev-dependencies it can help us to make better code and in future we can run it before tests to analyze code :)

And finally joke: I think that CndParserTest is here (in this package) so that i made this refactoring I wan't to mark it as skipped in the end but I was very surprised :-D :-D

Author: pavelvondrasek

.styleci.yml

@@ -1,5 +1,5 @@
 preset: psr2
 
 enabled:
-  - long_array_syntax
+  - short_array_syntax
   - duplicate_semicolon

bin/phpcr

@@ -5,7 +5,7 @@ use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Helper\HelperSet;
 use PHPCR\Util\Console\Command;
 
-if (!class_exists('\Symfony\Component\Console\Application')) {
+if (!class_exists(Application::class)) {
     if (is_file(__DIR__.'/../vendor/autoload.php')) {
         require __DIR__.'/../vendor/autoload.php';
     } elseif (is_file(__DIR__.'/../../../autoload.php')) {
@@ -30,7 +30,7 @@ if (file_exists($configFile)) {
     require $configFile;
 
     foreach ($GLOBALS as $helperSetCandidate) {
-        if ($helperSetCandidate instanceof \Symfony\Component\Console\Helper\HelperSet) {
+        if ($helperSetCandidate instanceof HelperSet) {
             $helperSet = $helperSetCandidate;
             break;
         }
@@ -48,7 +48,7 @@ $cli = new Application('PHPCR Command Line Interface', '0.1');
 $cli->setCatchExceptions(true);
 $cli->setHelperSet($helperSet);
 
-$cli->addCommands(array(
+$cli->addCommands([
     new Command\NodeDumpCommand(),
     new Command\NodeMoveCommand(),
     new Command\NodeRemoveCommand(),
@@ -62,7 +62,7 @@ $cli->addCommands(array(
     new Command\WorkspaceImportCommand(),
     new Command\WorkspacePurgeCommand(),
     new Command\WorkspaceQueryCommand(),
-));
+]);
 
 $cli->run();
 

composer.json

@@ -32,7 +32,9 @@
         "symfony/console": "~2.3|~3.0"
     },
     "require-dev": {
-        "ramsey/uuid": "^3.5"
+        "ramsey/uuid": "^3.5",
+        "phpunit/phpunit": "^5.7",
+        "phpstan/phpstan": "^0.6.0"
     },
     "suggest": {
         "ramsey/uuid": "A PHP 5.4+ library for generating RFC 4122 version 1, 3, 4, and 5 universally unique identifiers (UUID)."

src/PHPCR/Util/Console/Command/BaseNodeManipulationCommand.php

@@ -21,18 +21,22 @@ protected function configureNodeManipulationInput()
             InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY,
             'Set node property on nodes use foo=bar'
         );
+
         $this->addOption('remove-prop', 'r',
             InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY,
             'Remove property from nodes'
         );
+
         $this->addOption('add-mixin', null,
             InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY,
             'Add a mixin to the nodes'
         );
+
         $this->addOption('remove-mixin', null,
             InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY,
             'Remove mixin from the nodes'
         );
+
         $this->addOption('apply-closure', null,
             InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY,
             'Apply a closure to each node, closures are passed PHPCR\Session and PHPCR\NodeInterface'

src/PHPCR/Util/Console/Command/NodeDumpCommand.php

@@ -2,10 +2,12 @@
 
 namespace PHPCR\Util\Console\Command;
 
+use Exception;
 use PHPCR\ItemNotFoundException;
 use PHPCR\RepositoryException;
 use PHPCR\PathNotFoundException;
 use PHPCR\Util\UUIDHelper;
+use Symfony\Component\Console\Exception\InvalidArgumentException;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputInterface;
@@ -24,6 +26,8 @@ class NodeDumpCommand extends BaseCommand
 {
     /**
      * {@inheritDoc}
+     *
+     * @throws InvalidArgumentException
      */
     protected function configure()
     {
@@ -54,6 +58,10 @@ protected function configure()
 
     /**
      * {@inheritDoc}
+     *
+     * @throws InvalidArgumentException
+     * @throws Exception
+     * @throws RepositoryException
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
@@ -72,7 +80,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $options['max_line_length'] = $input->getOption('max_line_length');
 
         if (null !== $options['ref_format'] && !in_array($options['ref_format'], array('uuid', 'path'))) {
-            throw new \Exception('The ref-format option must be set to either "path" or "uuid"');
+            throw new Exception('The ref-format option must be set to either "path" or "uuid"');
         }
 
         $walker = $dumperHelper->getTreeWalker($output, $options);

src/PHPCR/Util/Console/Command/NodeMoveCommand.php

@@ -3,6 +3,7 @@
 namespace PHPCR\Util\Console\Command;
 
 use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Exception\InvalidArgumentException;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -19,6 +20,8 @@ class NodeMoveCommand extends BaseCommand
 {
     /**
      * {@inheritDoc}
+     *
+     * @throws InvalidArgumentException
      */
     protected function configure()
     {
@@ -42,6 +45,8 @@ protected function configure()
 
     /**
      * {@inheritDoc}
+     *
+     * @throws InvalidArgumentException
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {

src/PHPCR/Util/Console/Command/NodeRemoveCommand.php

@@ -2,7 +2,9 @@
 
 namespace PHPCR\Util\Console\Command;
 
+use InvalidArgumentException;
 use PHPCR\NodeInterface;
+use Symfony\Component\Console\Exception\InvalidArgumentException as CliInvalidArgumentException;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputInterface;
@@ -22,6 +24,8 @@ class NodeRemoveCommand extends BaseCommand
 {
     /**
      * {@inheritDoc}
+     *
+     * @throws CliInvalidArgumentException
      */
     protected function configure()
     {
@@ -51,6 +55,9 @@ protected function configure()
 
     /**
      * {@inheritDoc}
+     *
+     * @throws CliInvalidArgumentException
+     * @throws InvalidArgumentException
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
@@ -63,7 +70,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         if ('/' === $path) {
             // even if we have only children, this will not work as we would
             // try to remove system nodes.
-            throw new \InvalidArgumentException(
+            throw new InvalidArgumentException(
                 'Can not delete root node (path "/"), please use the '.
                 'workspace:purge command instead to purge the whole workspace.'
             );

src/PHPCR/Util/Console/Command/NodeTouchCommand.php

@@ -3,6 +3,7 @@
 namespace PHPCR\Util\Console\Command;
 
 use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Exception\InvalidArgumentException;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
@@ -23,6 +24,8 @@ class NodeTouchCommand extends BaseNodeManipulationCommand
 {
     /**
      * {@inheritDoc}
+     *
+     * @throws InvalidArgumentException
      */
     protected function configure()
     {
@@ -68,6 +71,8 @@ protected function configure()
 
     /**
      * {@inheritDoc}
+     *
+     * @throws InvalidArgumentException
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {

src/PHPCR/Util/Console/Command/NodeTypeListCommand.php

@@ -3,6 +3,7 @@
 namespace PHPCR\Util\Console\Command;
 
 use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Exception\InvalidArgumentException;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 

src/PHPCR/Util/Console/Command/NodeTypeRegisterCommand.php

@@ -130,7 +130,7 @@ protected function updateFromCnd(OutputInterface $output, SessionInterface $sess
      */
     protected function getFilePaths($definitions)
     {
-        $filePaths = array();
+        $filePaths = [];
 
         foreach ($definitions as $definition) {
             if (is_dir($definition)) {
@@ -167,7 +167,7 @@ protected function getFilePaths($definitions)
 
     protected function fileIsNodeType($filename)
     {
-        if (substr($filename, -4) == '.cnd') {
+        if (substr($filename, -4) === '.cnd') {
             return true;
         }