Merge pull request #191 from phpcr/analysis-bQyrO5

dbu · web-flow · commit 2166818929db · 2020-10-06T11:37:49.000+02:00
Apply fixes from StyleCI
diff --git a/src/PHPCR/Util/CND/Parser/CndParser.php b/src/PHPCR/Util/CND/Parser/CndParser.php
@@ -369,7 +369,7 @@ protected function parsePropDef(NodeTypeTemplateInterface $nodeType)
     protected function parsePropertyType(PropertyDefinitionTemplateInterface $property)
     {
         $types = ['STRING', 'BINARY', 'LONG', 'DOUBLE', 'BOOLEAN',  'DATE', 'NAME', 'PATH',
-                       'REFERENCE', 'WEAKREFERENCE', 'DECIMAL', 'URI', 'UNDEFINED', '*', '?', ];
+            'REFERENCE', 'WEAKREFERENCE', 'DECIMAL', 'URI', 'UNDEFINED', '*', '?', ];
 
         if (!$this->checkTokenIn(Token::TK_IDENTIFIER, $types, true)) {
             throw new ParserException($this->tokenQueue, sprintf('Invalid property type: %s', $this->tokenQueue->get()->getData()));
diff --git a/src/PHPCR/Util/Console/Command/BaseNodeManipulationCommand.php b/src/PHPCR/Util/Console/Command/BaseNodeManipulationCommand.php
@@ -17,27 +17,37 @@ abstract class BaseNodeManipulationCommand extends BaseCommand
      */
     protected function configureNodeManipulationInput()
     {
-        $this->addOption('set-prop', 'p',
+        $this->addOption(
+            'set-prop',
+            'p',
             InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY,
             'Set node property on nodes use foo=bar'
         );
 
-        $this->addOption('remove-prop', 'r',
+        $this->addOption(
+            'remove-prop',
+            'r',
             InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY,
             'Remove property from nodes'
         );
 
-        $this->addOption('add-mixin', null,
+        $this->addOption(
+            'add-mixin',
+            null,
             InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY,
             'Add a mixin to the nodes'
         );
 
-        $this->addOption('remove-mixin', null,
+        $this->addOption(
+            'remove-mixin',
+            null,
             InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY,
             'Remove mixin from the nodes'
         );
 
-        $this->addOption('apply-closure', null,
+        $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'
         );
diff --git a/src/PHPCR/Util/Console/Command/NodeDumpCommand.php b/src/PHPCR/Util/Console/Command/NodeDumpCommand.php
@@ -40,7 +40,8 @@ protected function configure()
             ->addOption('ref-format', 'uuid', InputOption::VALUE_REQUIRED, 'Set the way references should be displayed when dumping reference properties - either "uuid" (default) or "path"')
             ->addArgument('identifier', InputArgument::OPTIONAL, 'Root path to dump', '/')
             ->setDescription('Dump subtrees of the content repository')
-            ->setHelp(<<<'HERE'
+            ->setHelp(
+                <<<'HERE'
 The <info>dump</info> command recursively outputs the name of the node specified
 by the <info>identifier</info> argument and its subnodes in a yaml-like style.
 
diff --git a/src/PHPCR/Util/Console/Command/NodeMoveCommand.php b/src/PHPCR/Util/Console/Command/NodeMoveCommand.php
@@ -29,7 +29,8 @@ protected function configure()
             ->addArgument('source', InputArgument::REQUIRED, 'Path of node to move')
             ->addArgument('destination', InputArgument::REQUIRED, 'Destination for node')
             ->setDescription('Moves a node from one path to another')
-            ->setHelp(<<<'EOF'
+            ->setHelp(
+                <<<'EOF'
 This command simply moves a node from one path (the source path)
 to another (the destination path), it can also be considered
 as a rename command.
@@ -55,7 +56,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         $output->writeln(sprintf(
             '<info>Moving </info>%s<info> to </info>%s',
-            $sourcePath, $destPath
+            $sourcePath,
+            $destPath
         ));
 
         $session->move($sourcePath, $destPath);
diff --git a/src/PHPCR/Util/Console/Command/NodeRemoveCommand.php b/src/PHPCR/Util/Console/Command/NodeRemoveCommand.php
@@ -36,7 +36,8 @@ protected function configure()
             ->addArgument('path', InputArgument::REQUIRED, 'Path of the node to purge')
             ->addOption('force', null, InputOption::VALUE_NONE, 'Use to bypass the confirmation dialog')
             ->addOption('only-children', null, InputOption::VALUE_NONE, 'Use to only purge children of specified path')
-            ->setHelp(<<<'EOF'
+            ->setHelp(
+                <<<'EOF'
 The <info>phpcr:node:remove</info> command will remove the given node or the
 children of the given node according to the options given.
 
diff --git a/src/PHPCR/Util/Console/Command/NodeTouchCommand.php b/src/PHPCR/Util/Console/Command/NodeTouchCommand.php
@@ -39,17 +39,21 @@ protected function configure()
                 'Path at which to create the new node'
             )
             ->addOption(
-                'type', 't',
+                'type',
+                't',
                 InputOption::VALUE_OPTIONAL,
                 'Node type, default nt:unstructured',
                 'nt:unstructured'
             )
-            ->addOption('dump', 'd',
+            ->addOption(
+                'dump',
+                'd',
                 InputOption::VALUE_NONE,
                 'Dump a string reperesentation of the created / modified node.'
             )
             ->setDescription('Create or modify a node')
-            ->setHelp(<<<'HERE'
+            ->setHelp(
+                <<<'HERE'
 This command allows you to create or modify a node at the specified path.
 
 For example::
@@ -65,7 +69,7 @@ protected function configure()
 
   $ ./bin/phpcr phpcr:touch /foobar --type=my:nodetype --set-prop=bar=myvalue --remove-prop=foo --dump
 HERE
-);
+            );
     }
 
     /**
@@ -104,7 +108,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
             if ($nodeType != $type) {
                 $output->writeln(sprintf(
                     '<error>You have specified node type "%s" but the existing node is of type "%s"</error>',
-                    $type, $nodeType
+                    $type,
+                    $nodeType
                 ));
 
                 return 1;
@@ -125,7 +130,9 @@ protected function execute(InputInterface $input, OutputInterface $output)
             }
 
             $output->writeln(sprintf(
-                '<info>Creating node: </info> %s [%s]', $path, $type
+                '<info>Creating node: </info> %s [%s]',
+                $path,
+                $type
             ));
 
             $node = $parentNode->addNode($nodeName, $type);
diff --git a/src/PHPCR/Util/Console/Command/NodeTypeListCommand.php b/src/PHPCR/Util/Console/Command/NodeTypeListCommand.php
@@ -23,7 +23,8 @@ protected function configure()
         $this
             ->setName('phpcr:node-type:list')
             ->setDescription('List all available node types in the repository')
-            ->setHelp(<<<'EOT'
+            ->setHelp(
+                <<<'EOT'
 This command lists all of the available node types and their subtypes
 in the PHPCR repository.
 EOT
diff --git a/src/PHPCR/Util/Console/Command/NodeTypeRegisterCommand.php b/src/PHPCR/Util/Console/Command/NodeTypeRegisterCommand.php
@@ -36,7 +36,8 @@ protected function configure()
             ->setDescription('Register node types in the PHPCR repository')
             ->addArgument('cnd-file', InputArgument::IS_ARRAY, 'Register namespaces and node types from a "Compact Node Type Definition" .cnd file(s)')
             ->addOption('allow-update', null, InputOption::VALUE_NONE, 'Overwrite existig node type')
-            ->setHelp(<<<'EOT'
+            ->setHelp(
+                <<<'EOT'
 Register node types in the PHPCR repository.
 
 This command allows to register node types in the repository that are defined
diff --git a/src/PHPCR/Util/Console/Command/NodesUpdateCommand.php b/src/PHPCR/Util/Console/Command/NodesUpdateCommand.php
@@ -33,24 +33,28 @@ protected function configure()
 
         $this->setName('phpcr:nodes:update')
             ->addOption(
-                'query', null,
+                'query',
+                null,
                 InputOption::VALUE_REQUIRED,
                 'Query used to select the nodes'
             )
             ->addOption(
-                'query-language', 'l',
+                'query-language',
+                'l',
                 InputOption::VALUE_OPTIONAL,
                 'The query language (e.g. sql, jcr_sql2)',
                 'jcr-sql2'
             )
             ->addOption(
-                'persist-counter', 'c',
+                'persist-counter',
+                'c',
                 InputOption::VALUE_OPTIONAL,
                 'Save the session every x requests',
                 '100'
             )
             ->setDescription('Command to manipulate the nodes in the workspace.')
-            ->setHelp(<<<HERE
+            ->setHelp(
+                <<<HERE
 The <info>phpcr:nodes:update</info> can manipulate the properties of nodes
 found using the given query.
 
@@ -77,7 +81,7 @@ protected function configure()
 For each node in the result set, the closure will be passed the current
 <comment>PHPCR\SessionInterface</comment> implementation and the node (<comment>PHPCR\NodeInterface</comment>) as <comment>\$session</comment> and <comment>\$node</comment>.
 HERE
-);
+            );
     }
 
     /**
diff --git a/src/PHPCR/Util/Console/Command/WorkspaceCreateCommand.php b/src/PHPCR/Util/Console/Command/WorkspaceCreateCommand.php
@@ -27,13 +27,14 @@ protected function configure()
             ->setName('phpcr:workspace:create')
             ->addArgument('name', InputArgument::REQUIRED, 'Name of the workspace to create')
             ->addOption(
-               'ignore-existing',
-               null,
-               InputOption::VALUE_NONE,
-               'If set, an existing workspace will return a success code'
+                'ignore-existing',
+                null,
+                InputOption::VALUE_NONE,
+                'If set, an existing workspace will return a success code'
             )
             ->setDescription('Create a workspace in the configured repository')
-            ->setHelp(<<<'EOT'
+            ->setHelp(
+                <<<'EOT'
 The <info>workspace:create</info> command creates a workspace with the specified name.
 It will fail if a workspace with that name already exists or if the repository implementation
 does not support the workspace creation operation.
diff --git a/src/PHPCR/Util/Console/Command/WorkspaceDeleteCommand.php b/src/PHPCR/Util/Console/Command/WorkspaceDeleteCommand.php
@@ -27,7 +27,8 @@ protected function configure()
             ->addArgument('name', InputArgument::REQUIRED, 'Name of the workspace to delete')
             ->addOption('force', null, InputOption::VALUE_NONE, 'Use to bypass the confirmation dialog')
             ->setDescription('Delete a workspace from the configured repository')
-            ->setHelp(<<<'EOT'
+            ->setHelp(
+                <<<'EOT'
 The <info>workspace:delete</info> command deletes the workspace with the specified name if it
 exists. If the workspace with that name does not yet exist, the command will not fail.
 However, if the workspace does exist but the repository implementation does not support
diff --git a/src/PHPCR/Util/Console/Command/WorkspaceExportCommand.php b/src/PHPCR/Util/Console/Command/WorkspaceExportCommand.php
@@ -31,7 +31,8 @@ protected function configure()
             ->addOption('skip_binary', null, InputOption::VALUE_OPTIONAL, 'Set to "yes" to skip binaries', 'no')
             ->addOption('recurse', null, InputOption::VALUE_OPTIONAL, 'Set to "no" to prevent recursion', 'yes')
             ->setDescription('Export nodes from the repository, either to the JCR system view format or the document view format')
-            ->setHelp(<<<'EOF'
+            ->setHelp(
+                <<<'EOF'
 The <info>export</info> command uses the PHPCR SessionInterface::exportSystemView
 method to export parts of the repository into an XML document.
 
diff --git a/src/PHPCR/Util/Console/Command/WorkspaceImportCommand.php b/src/PHPCR/Util/Console/Command/WorkspaceImportCommand.php
@@ -37,7 +37,8 @@ protected function configure()
             ->addOption('parentpath', 'p', InputOption::VALUE_OPTIONAL, 'Repository path to the parent where to import the file contents', '/')
             ->addOption('uuid-behavior', null, InputOption::VALUE_REQUIRED, 'How to handle UUID collisions during the import', 'new')
             ->setDescription('Import xml data into the repository, either in JCR system view format or arbitrary xml')
-            ->setHelp(<<<'EOF'
+            ->setHelp(
+                <<<'EOF'
 The <info>import</info> command uses the PHPCR SessionInterface::importXml method
 to import an XML document into the repository. If the document is in the JCR
 system view format, it is interpreted according to the spec, otherwise it is
diff --git a/src/PHPCR/Util/Console/Command/WorkspaceListCommand.php b/src/PHPCR/Util/Console/Command/WorkspaceListCommand.php
@@ -22,7 +22,8 @@ protected function configure()
         $this
             ->setName('phpcr:workspace:list')
             ->setDescription('List all available workspaces in the configured repository')
-            ->setHelp(<<<'EOT'
+            ->setHelp(
+                <<<'EOT'
 The <info>workspace:list</info> command lists all avaialable workspaces.
 EOT
             );
diff --git a/src/PHPCR/Util/Console/Command/WorkspacePurgeCommand.php b/src/PHPCR/Util/Console/Command/WorkspacePurgeCommand.php
@@ -28,7 +28,8 @@ protected function configure()
             ->setName('phpcr:workspace:purge')
             ->setDescription('Remove all nodes from a workspace')
             ->addOption('force', null, InputOption::VALUE_NONE, 'Use to bypass the confirmation dialog')
-            ->setHelp(<<<'EOF'
+            ->setHelp(
+                <<<'EOF'
 The <info>phpcr:workspace:purge</info> command removes all nodes except the
 system nodes and all non-system properties of the root node from the workspace.
 EOF
diff --git a/src/PHPCR/Util/Console/Helper/PhpcrHelper.php b/src/PHPCR/Util/Console/Helper/PhpcrHelper.php
@@ -76,7 +76,8 @@ public function processNode(OutputInterface $output, NodeInterface $node, array
             $parts = explode('=', $set);
             $output->writeln(sprintf(
                 '<comment> > Setting property </comment>%s<comment> to </comment>%s',
-                $parts[0], $parts[1]
+                $parts[0],
+                $parts[1]
             ));
             $node->setProperty($parts[0], $parts[1]);
         }
@@ -134,7 +135,8 @@ public function processNode(OutputInterface $output, NodeInterface $node, array
                 if (!is_string($value)) {
                     $value = print_r($value, true);
                 }
-                $output->writeln(sprintf('<comment> - %s = </comment>%s',
+                $output->writeln(sprintf(
+                    '<comment> - %s = </comment>%s',
                     $property->getName(),
                     $value
                 ));
@@ -181,7 +183,8 @@ protected function validateQueryLanguage($language)
 
         throw new Exception(sprintf(
             'Query language "%s" not supported, available query languages: %s',
-            $language, implode(',', $langs)
+            $language,
+            implode(',', $langs)
         ));
     }
 }
diff --git a/src/PHPCR/Util/PathHelper.php b/src/PHPCR/Util/PathHelper.php
@@ -272,7 +272,8 @@ public static function getNodeName($path)
 
         if (false === $strrpos) {
             self::error(sprintf(
-                'Path "%s" must be an absolute path', $path
+                'Path "%s" must be an absolute path',
+                $path
             ), true);
         }
 
diff --git a/src/PHPCR/Util/QOM/BaseQomToSqlQueryConverter.php b/src/PHPCR/Util/QOM/BaseQomToSqlQueryConverter.php
@@ -143,7 +143,8 @@ protected function convertPropertyExistence(QOM\PropertyExistenceInterface $cons
     {
         return $this->generator->evalPropertyExistence(
             $constraint->getSelectorName(),
-            $constraint->getPropertyName());
+            $constraint->getPropertyName()
+        );
     }
 
     /**
@@ -229,7 +230,8 @@ protected function convertPropertyValue(QOM\PropertyValueInterface $value)
     {
         return $this->generator->evalPropertyValue(
             $value->getPropertyName(),
-            $value->getSelectorName());
+            $value->getSelectorName()
+        );
     }
 
     /**
diff --git a/src/PHPCR/Util/QOM/QomToSql1QueryConverter.php b/src/PHPCR/Util/QOM/QomToSql1QueryConverter.php
@@ -52,13 +52,15 @@ protected function convertConstraint(QOM\ConstraintInterface $constraint)
         if ($constraint instanceof QOM\AndInterface) {
             return $this->generator->evalAnd(
                 $this->convertConstraint($constraint->getConstraint1()),
-                $this->convertConstraint($constraint->getConstraint2()));
+                $this->convertConstraint($constraint->getConstraint2())
+            );
         }
 
         if ($constraint instanceof QOM\OrInterface) {
             return $this->generator->evalOr(
                 $this->convertConstraint($constraint->getConstraint1()),
-                $this->convertConstraint($constraint->getConstraint2()));
+                $this->convertConstraint($constraint->getConstraint2())
+            );
         }
 
         if ($constraint instanceof QOM\NotInterface) {
@@ -81,12 +83,14 @@ protected function convertConstraint(QOM\ConstraintInterface $constraint)
 
         if ($constraint instanceof QOM\ChildNodeInterface) {
             return $this->generator->evalChildNode(
-                $this->convertPath($constraint->getParentPath()));
+                $this->convertPath($constraint->getParentPath())
+            );
         }
 
         if ($constraint instanceof QOM\DescendantNodeInterface) {
             return $this->generator->evalDescendantNode(
-                $this->convertPath($constraint->getAncestorPath()));
+                $this->convertPath($constraint->getAncestorPath())
+            );
         }
 
         // This should not happen, but who knows...
diff --git a/src/PHPCR/Util/QOM/QomToSql2QueryConverter.php b/src/PHPCR/Util/QOM/QomToSql2QueryConverter.php
diff --git a/src/PHPCR/Util/UUIDHelper.php b/src/PHPCR/Util/UUIDHelper.php
diff --git a/tests/PHPCR/Tests/Util/CND/Scanner/GenericScannerTest.php b/tests/PHPCR/Tests/Util/CND/Scanner/GenericScannerTest.php
diff --git a/tests/PHPCR/Tests/Util/ValueConverterTest.php b/tests/PHPCR/Tests/Util/ValueConverterTest.php

Original file line number	Diff line number	Diff line change
`@@ -369,7 +369,7 @@ protected function parsePropDef(NodeTypeTemplateInterface $nodeType)`
`369`	`369`	`protected function parsePropertyType(PropertyDefinitionTemplateInterface $property)`
`370`	`370`	`{`
`371`	`371`	`$types = ['STRING', 'BINARY', 'LONG', 'DOUBLE', 'BOOLEAN', 'DATE', 'NAME', 'PATH',`
`372`		`- 'REFERENCE', 'WEAKREFERENCE', 'DECIMAL', 'URI', 'UNDEFINED', '*', '?', ];`
	`372`	`+ 'REFERENCE', 'WEAKREFERENCE', 'DECIMAL', 'URI', 'UNDEFINED', '*', '?', ];`
`373`	`373`
`374`	`374`	`if (!$this->checkTokenIn(Token::TK_IDENTIFIER, $types, true)) {`
`375`	`375`	`throw new ParserException($this->tokenQueue, sprintf('Invalid property type: %s', $this->tokenQueue->get()->getData()));`