Merge pull request #226 from phpcr/cs

cs fixer for php 8.3
phpcr · Apr 8, 2024 · 51a2bbf · 51a2bbf
2 parents df25fda + 36c0654
commit 51a2bbf
Show file tree

Hide file tree

Showing 10 changed files with 36 additions and 36 deletions.
diff --git a/src/PHPCR/Util/CND/Parser/AbstractParser.php b/src/PHPCR/Util/CND/Parser/AbstractParser.php
@@ -31,7 +31,7 @@ abstract class AbstractParser
      * If the data is not provided (equal to null) then only the token type is checked.
      * Return false otherwise.
      */
-    protected function checkToken(int $type, string $data = null, bool $ignoreCase = false): bool
+    protected function checkToken(int $type, ?string $data = null, bool $ignoreCase = false): bool
     {
         if ($this->tokenQueue->isEof()) {
             return false;
@@ -79,7 +79,7 @@ protected function checkTokenIn(int $type, array $data, bool $ignoreCase = false
      *
      * @throws ParserException
      */
-    protected function expectToken(int $type, string $data = null): Token
+    protected function expectToken(int $type, ?string $data = null): Token
     {
         $token = $this->tokenQueue->peek();
 
@@ -99,7 +99,7 @@ protected function expectToken(int $type, string $data = null): Token
      * @param int         $type The expected token type
      * @param string|null $data The expected token data or null
      */
-    protected function checkAndExpectToken(int $type, string $data = null): false|Token
+    protected function checkAndExpectToken(int $type, ?string $data = null): false|Token
     {
         if ($this->checkToken($type, $data)) {
             $token = $this->tokenQueue->peek();

diff --git a/src/PHPCR/Util/CND/Scanner/TokenQueue.php b/src/PHPCR/Util/CND/Scanner/TokenQueue.php
@@ -54,7 +54,7 @@ public function peek($offset = 0): Token|false
         return $this->tokens[key($this->tokens) + $offset];
     }
 
-    public function get($count = 1): Token|null
+    public function get($count = 1): ?Token
     {
         $item = null;
         for ($i = 1; $i <= $count; ++$i) {

diff --git a/src/PHPCR/Util/NodeHelper.php b/src/PHPCR/Util/NodeHelper.php
@@ -137,7 +137,7 @@ public static function isSystemItem(ItemInterface $item): bool
      *                             $nameHint which does not exist and this implementation performs
      *                             this validation immediately
      */
-    public static function generateAutoNodeName(array $usedNames, array $namespaces, string $defaultNamespace, string $nameHint = null): string
+    public static function generateAutoNodeName(array $usedNames, array $namespaces, string $defaultNamespace, ?string $nameHint = null): string
     {
         $usedNames = array_flip($usedNames);
 

diff --git a/src/PHPCR/Util/QOM/BaseQomToSqlQueryConverter.php b/src/PHPCR/Util/QOM/BaseQomToSqlQueryConverter.php
@@ -130,7 +130,7 @@ protected function convertFullTextSearch(QOM\FullTextSearchInterface $constraint
     /**
      * FullTextSearchExpression ::= BindVariable | ''' FullTextSearchLiteral '''.
      *
-     * @param string|QOM\StaticOperandInterface $expr
+     * @param string|StaticOperandInterface $expr
      */
     protected function convertFullTextSearchExpression($expr): string
     {
@@ -169,7 +169,7 @@ protected function convertFullTextSearchExpression($expr): string
      *
      * @throws \InvalidArgumentException
      */
-    protected function convertStaticOperand(QOM\StaticOperandInterface $operand): string
+    protected function convertStaticOperand(StaticOperandInterface $operand): string
     {
         if ($operand instanceof QOM\BindVariableValueInterface) {
             return $this->convertBindVariable($operand->getBindVariableName());

diff --git a/src/PHPCR/Util/QOM/BaseSqlGenerator.php b/src/PHPCR/Util/QOM/BaseSqlGenerator.php
@@ -228,7 +228,7 @@ abstract public function evalCastLiteral(string $literal, string $type): string;
      * @param string|null $selectorName The selector name. If it is different than the nodeTypeName, the alias is
      *                                  declared if supported by the SQL dialect.
      */
-    abstract public function evalSelector(string $nodeTypeName, string $selectorName = null): string;
+    abstract public function evalSelector(string $nodeTypeName, ?string $selectorName = null): string;
 
     /**
      * Evaluate a path. This is different between SQL1 and SQL2.
@@ -244,15 +244,15 @@ abstract public function evalPath(string $path): string;
      */
     abstract public function evalColumns(iterable $columns): string;
 
-    abstract public function evalColumn(string $selectorName, string $propertyName = null, string $colname = null): string;
+    abstract public function evalColumn(string $selectorName, ?string $propertyName = null, ?string $colname = null): string;
 
     abstract public function evalPropertyExistence(?string $selectorName, string $propertyName): string;
 
-    abstract public function evalPropertyValue(string $propertyName, string $selectorName = null);
+    abstract public function evalPropertyValue(string $propertyName, ?string $selectorName = null);
 
-    abstract public function evalChildNode(string $path, string $selectorName = null);
+    abstract public function evalChildNode(string $path, ?string $selectorName = null);
 
-    abstract public function evalDescendantNode(string $path, string $selectorName = null): string;
+    abstract public function evalDescendantNode(string $path, ?string $selectorName = null): string;
 
-    abstract public function evalFullTextSearch(string $selectorName, string $searchExpression, string $propertyName = null): string;
+    abstract public function evalFullTextSearch(string $selectorName, string $searchExpression, ?string $propertyName = null): string;
 }
diff --git a/src/PHPCR/Util/QOM/QueryBuilder.php b/src/PHPCR/Util/QOM/QueryBuilder.php
@@ -296,7 +296,7 @@ public function setColumns(array $columns): static
      * Identifies a property in the specified or default selector to include in the tabular view of query results.
      * Replaces any previously specified columns to be selected if any.
      */
-    public function select(string $selectorName, string $propertyName, string $columnName = null): static
+    public function select(string $selectorName, string $propertyName, ?string $columnName = null): static
     {
         $this->state = self::STATE_DIRTY;
         $this->columns = [$this->qomFactory->column($selectorName, $propertyName, $columnName)];
@@ -307,7 +307,7 @@ public function select(string $selectorName, string $propertyName, string $colum
     /**
      * Adds a property in the specified or default selector to include in the tabular view of query results.
      */
-    public function addSelect(string $selectorName, string $propertyName, string $columnName = null): static
+    public function addSelect(string $selectorName, string $propertyName, ?string $columnName = null): static
     {
         $this->state = self::STATE_DIRTY;
 

diff --git a/src/PHPCR/Util/QOM/Sql1Generator.php b/src/PHPCR/Util/QOM/Sql1Generator.php
@@ -19,7 +19,7 @@ class Sql1Generator extends BaseSqlGenerator
      * @param string      $nodeTypeName The node type of the selector. If it does not contain starting and ending brackets ([]) they will be added automatically
      * @param string|null $selectorName (unused)
      */
-    public function evalSelector(string $nodeTypeName, string $selectorName = null): string
+    public function evalSelector(string $nodeTypeName, ?string $selectorName = null): string
     {
         return $nodeTypeName;
     }
@@ -43,7 +43,7 @@ protected function getPathForDescendantQuery(string $path): string
     /**
      * SameNode ::= 'jcr:path like Path/% and not jcr:path like Path/%/%'.
      */
-    public function evalChildNode(string $path, string $selectorName = null): string
+    public function evalChildNode(string $path, ?string $selectorName = null): string
     {
         $path = $this->getPathForDescendantQuery($path);
         $sql1 = "jcr:path LIKE '".$path."'";
@@ -57,7 +57,7 @@ public function evalChildNode(string $path, string $selectorName = null): string
      *
      * @param string|null $selectorName Unused
      */
-    public function evalDescendantNode(string $path, string $selectorName = null): string
+    public function evalDescendantNode(string $path, ?string $selectorName = null): string
     {
         $path = $this->getPathForDescendantQuery($path);
 
@@ -84,7 +84,7 @@ public function evalPropertyExistence(?string $selectorName, string $propertyNam
      *
      * @param string $selectorName unusued
      */
-    public function evalFullTextSearch(string $selectorName, string $searchExpression, string $propertyName = null): string
+    public function evalFullTextSearch(string $selectorName, string $searchExpression, ?string $propertyName = null): string
     {
         $propertyName = $propertyName ?: '*';
 
@@ -123,7 +123,7 @@ public function evalColumns(iterable $columns): string
      *
      * @param string|null $selectorName unused in SQL1
      */
-    public function evalPropertyValue(string $propertyName, string $selectorName = null): string
+    public function evalPropertyValue(string $propertyName, ?string $selectorName = null): string
     {
         return $propertyName;
     }
@@ -137,7 +137,7 @@ public function evalPropertyValue(string $propertyName, string $selectorName = n
      * @param string      $selectorName unused in SQL1
      * @param string|null $colname      unused in SQL1
      */
-    public function evalColumn(string $selectorName, string $propertyName = null, string $colname = null): string
+    public function evalColumn(string $selectorName, ?string $propertyName = null, ?string $colname = null): string
     {
         return $propertyName;
     }

diff --git a/src/PHPCR/Util/QOM/Sql2Generator.php b/src/PHPCR/Util/QOM/Sql2Generator.php
@@ -24,7 +24,7 @@ class Sql2Generator extends BaseSqlGenerator
      * @param string|null $selectorName The selector name. If it is different than
      *                                  the nodeTypeName, the alias is declared.
      */
-    public function evalSelector(string $nodeTypeName, string $selectorName = null): string
+    public function evalSelector(string $nodeTypeName, ?string $selectorName = null): string
     {
         $sql2 = $this->addBracketsIfNeeded($nodeTypeName);
 
@@ -83,7 +83,7 @@ public function evalEquiJoinCondition(string $sel1Name, string $prop1Name, strin
      *                  [',' selector2Path] ')'
      *   selector2Path ::= Path.
      */
-    public function evalSameNodeJoinCondition(string $sel1Name, string $sel2Name, string $sel2Path = null): string
+    public function evalSameNodeJoinCondition(string $sel1Name, string $sel2Name, ?string $sel2Path = null): string
     {
         $sql2 = 'ISSAMENODE('
             .$this->addBracketsIfNeeded($sel1Name).', '
@@ -127,7 +127,7 @@ public function evalDescendantNodeJoinCondition(string $descendantSelectorName,
     /**
      * SameNode ::= 'ISSAMENODE(' [selectorName ','] Path ')'.
      */
-    public function evalSameNode(string $path, string $selectorName = null): string
+    public function evalSameNode(string $path, ?string $selectorName = null): string
     {
         $sql2 = 'ISSAMENODE(';
         $sql2 .= null === $selectorName ? $path : $this->addBracketsIfNeeded($selectorName).', '.$path;
@@ -139,7 +139,7 @@ public function evalSameNode(string $path, string $selectorName = null): string
     /**
      * SameNode ::= 'ISCHILDNODE(' [selectorName ','] Path ')'.
      */
-    public function evalChildNode(string $path, string $selectorName = null): string
+    public function evalChildNode(string $path, ?string $selectorName = null): string
     {
         $sql2 = 'ISCHILDNODE(';
         $sql2 .= null === $selectorName ? $path : $this->addBracketsIfNeeded($selectorName).', '.$path;
@@ -151,7 +151,7 @@ public function evalChildNode(string $path, string $selectorName = null): string
     /**
      * SameNode ::= 'ISDESCENDANTNODE(' [selectorName ','] Path ')'.
      */
-    public function evalDescendantNode(string $path, string $selectorName = null): string
+    public function evalDescendantNode(string $path, ?string $selectorName = null): string
     {
         $sql2 = 'ISDESCENDANTNODE(';
         $sql2 .= null === $selectorName ? $path : $this->addBracketsIfNeeded($selectorName).', '.$path;
@@ -179,7 +179,7 @@ public function evalPropertyExistence(?string $selectorName, string $propertyNam
      *                    FullTextSearchExpression ')'
      * FullTextSearchExpression ::= BindVariable | ''' FullTextSearchLiteral '''.
      */
-    public function evalFullTextSearch(string $selectorName, string $searchExpression, string $propertyName = null): string
+    public function evalFullTextSearch(string $selectorName, string $searchExpression, ?string $propertyName = null): string
     {
         $propertyName = $propertyName ?: '*';
 
@@ -201,31 +201,31 @@ public function evalLength(string $propertyValue): string
     /**
      * NodeName ::= 'NAME(' [selectorName] ')'.
      */
-    public function evalNodeName(string $selectorValue = null): string
+    public function evalNodeName(?string $selectorValue = null): string
     {
         return "NAME($selectorValue)";
     }
 
     /**
      * NodeLocalName ::= 'LOCALNAME(' [selectorName] ')'.
      */
-    public function evalNodeLocalName(string $selectorValue = null): string
+    public function evalNodeLocalName(?string $selectorValue = null): string
     {
         return "LOCALNAME($selectorValue)";
     }
 
     /**
      * FullTextSearchScore ::= 'SCORE(' [selectorName] ')'.
      */
-    public function evalFullTextSearchScore(string $selectorValue = null): string
+    public function evalFullTextSearchScore(?string $selectorValue = null): string
     {
         return "SCORE($selectorValue)";
     }
 
     /**
      * PropertyValue ::= [selectorName'.'] propertyName     // If only one selector exists.
      */
-    public function evalPropertyValue(string $propertyName, string $selectorName = null): string
+    public function evalPropertyValue(string $propertyName, ?string $selectorName = null): string
     {
         $sql2 = null !== $selectorName ? $this->addBracketsIfNeeded($selectorName).'.' : '';
         if ('*' !== $propertyName && !str_starts_with($propertyName, '[')) {
@@ -267,7 +267,7 @@ public function evalColumns(iterable $columns): string
      * propertyName ::= Name
      * columnName ::= Name.
      */
-    public function evalColumn(string $selectorName, string $propertyName = null, string $colname = null): string
+    public function evalColumn(string $selectorName, ?string $propertyName = null, ?string $colname = null): string
     {
         $sql2 = '';
         if (null !== $selectorName && null === $propertyName && null === $colname) {

diff --git a/src/PHPCR/Util/QOM/Sql2ToQomQueryConverter.php b/src/PHPCR/Util/QOM/Sql2ToQomQueryConverter.php
@@ -61,7 +61,7 @@ class Sql2ToQomQueryConverter
     /**
      * @param ValueConverter|null $valueConverter to override default converter
      */
-    public function __construct(QueryObjectModelFactoryInterface $factory, ValueConverter $valueConverter = null)
+    public function __construct(QueryObjectModelFactoryInterface $factory, ?ValueConverter $valueConverter = null)
     {
         $this->factory = $factory;
         $this->valueConverter = $valueConverter ?: new ValueConverter();
@@ -313,7 +313,7 @@ protected function parseDescendantNodeJoinCondition(): DescendantNodeJoinConditi
      *
      * @throws \Exception
      */
-    protected function parseConstraint(ConstraintInterface $lhs = null, int $minprec = 0): ConstraintInterface|null
+    protected function parseConstraint(?ConstraintInterface $lhs = null, int $minprec = 0): ?ConstraintInterface
     {
         if (null === $lhs) {
             $lhs = $this->parsePrimaryConstraint();
@@ -924,7 +924,7 @@ protected function updateImplicitSelectorName(string $selectorName): void
      * @throws InvalidQueryException if there was no explicit selector and
      *                               there is more than one selector available
      */
-    protected function ensureSelectorName(?string $parsedName): string|null
+    protected function ensureSelectorName(?string $parsedName): ?string
     {
         if (null !== $parsedName) {
             if ((is_array($this->implicitSelectorName) && !isset($this->implicitSelectorName[$parsedName]))

diff --git a/src/PHPCR/Util/TreeWalker.php b/src/PHPCR/Util/TreeWalker.php
@@ -39,7 +39,7 @@ class TreeWalker
      * @param ItemVisitorInterface      $nodeVisitor     The visitor for the nodes
      * @param ItemVisitorInterface|null $propertyVisitor The visitor for the nodes properties
      */
-    public function __construct(ItemVisitorInterface $nodeVisitor, ItemVisitorInterface $propertyVisitor = null)
+    public function __construct(ItemVisitorInterface $nodeVisitor, ?ItemVisitorInterface $propertyVisitor = null)
     {
         $this->nodeVisitor = $nodeVisitor;
         $this->propertyVisitor = $propertyVisitor;