Merge #458 - Disallow short nullable

Pull-request: #458
Pull-request: #457

Signed-off-by: William Desportes <[email protected]>

Author: williamdes

phpcs.xml.dist

@@ -69,9 +69,6 @@
     <rule ref="SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingNativeTypeHint">
         <severity>4</severity>
     </rule>
-    <rule ref="SlevomatCodingStandard.TypeHints.UnionTypeHintFormat.DisallowedShortNullable">
-        <severity>4</severity>
-    </rule>
     <rule ref="Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps">
         <severity>4</severity>
     </rule>

src/Components/IndexHint.php

@@ -52,9 +52,9 @@ final class IndexHint implements Component
      * @param Expression[] $indexes    List of indexes in this hint
      */
     public function __construct(
-        ?string $type = null,
-        ?string $indexOrKey = null,
-        ?string $for = null,
+        string|null $type = null,
+        string|null $indexOrKey = null,
+        string|null $for = null,
         array $indexes = []
     ) {
         $this->type = $type;

src/Context.php

@@ -357,7 +357,7 @@ abstract class Context
      *
      * @param bool $isReserved checks if the keyword is reserved
      */
-    public static function isKeyword(string $string, bool $isReserved = false): ?int
+    public static function isKeyword(string $string, bool $isReserved = false): int|null
     {
         $upperString = strtoupper($string);
 
@@ -374,7 +374,7 @@ public static function isKeyword(string $string, bool $isReserved = false): ?int
     /**
      * Checks if the given string is an operator and returns the appropriate flag for the operator.
      */
-    public static function isOperator(string $string): ?int
+    public static function isOperator(string $string): int|null
     {
         return static::$operators[$string] ?? null;
     }
@@ -392,7 +392,7 @@ public static function isWhitespace(string $string): bool
      *
      * @return int|null the appropriate flag for the comment type
      */
-    public static function isComment(string $string, bool $end = false): ?int
+    public static function isComment(string $string, bool $end = false): int|null
     {
         if ($string === '') {
             return null;
@@ -455,7 +455,7 @@ public static function isNumber(string $string): bool
      *
      * @return int|null the appropriate flag for the symbol type
      */
-    public static function isSymbol(string $string): ?int
+    public static function isSymbol(string $string): int|null
     {
         if ($string === '') {
             return null;
@@ -483,7 +483,7 @@ public static function isSymbol(string $string): ?int
      *
      * @return int|null the appropriate flag for the string type
      */
-    public static function isString(string $string): ?int
+    public static function isString(string $string): int|null
     {
         if ($string === '') {
             return null;
@@ -559,7 +559,7 @@ public static function load(string $context = ''): bool
      *
      * @return string|null The loaded context. `null` if no context was loaded.
      */
-    public static function loadClosest(string $context = ''): ?string
+    public static function loadClosest(string $context = ''): string|null
     {
         $length = strlen($context);
         for ($i = $length; $i > 0;) {
@@ -776,7 +776,7 @@ public static function getIdentifierQuote(): string
      *
      * @return bool false on empty param, true/false on given constant/int value
      */
-    public static function hasMode(?int $flag = null): bool
+    public static function hasMode(int|null $flag = null): bool
     {
         if (empty($flag)) {
             return false;

src/Exceptions/ParserException.php

@@ -24,7 +24,7 @@ class ParserException extends Exception
      * @param Token  $token the token that produced this exception
      * @param int    $code  the code of this error
      */
-    public function __construct($msg = '', ?Token $token = null, $code = 0)
+    public function __construct($msg = '', Token|null $token = null, $code = 0)
     {
         parent::__construct($msg, $code);
         $this->token = $token;

src/Parser.php

@@ -629,7 +629,7 @@ public function parse()
      *
      * @throws ParserException throws the exception, if strict mode is enabled.
      */
-    public function error($msg, ?Token $token = null, $code = 0)
+    public function error($msg, Token|null $token = null, $code = 0)
     {
         $error = new ParserException(
             Translator::gettext($msg),

src/Statement.php

@@ -102,7 +102,7 @@ abstract class Statement implements Stringable
      * @param Parser|null     $parser the instance that requests parsing
      * @param TokensList|null $list   the list of tokens to be parsed
      */
-    public function __construct(?Parser $parser = null, ?TokensList $list = null)
+    public function __construct(Parser|null $parser = null, TokensList|null $list = null)
     {
         if (($parser === null) || ($list === null)) {
             return;

src/TokensList.php

@@ -118,7 +118,7 @@ public function getNext()
      * Gets the previous token. Skips any irrelevant token (whitespaces and
      * comments).
      */
-    public function getPrevious(): ?Token
+    public function getPrevious(): Token|null
     {
         for (; $this->idx >= 0; --$this->idx) {
             if (
@@ -201,7 +201,7 @@ public function getNextOfTypeAndValue($type, $value)
      * @param int $type the type of the token
      * @param int $flag the flag of the token
      */
-    public function getNextOfTypeAndFlag(int $type, int $flag): ?Token
+    public function getNextOfTypeAndFlag(int $type, int $flag): Token|null
     {
         for (; $this->idx < $this->count; ++$this->idx) {
             if (($this->tokens[$this->idx]->type === $type) && ($this->tokens[$this->idx]->flags === $flag)) {

tests/Lexer/ContextTest.php

@@ -30,7 +30,7 @@ public function testLoad(): void
      *
      * @dataProvider contextLoadingProvider
      */
-    public function testLoadClosest(string $context, ?string $expected): void
+    public function testLoadClosest(string $context, string|null $expected): void
     {
         $this->assertEquals($expected, Context::loadClosest($context));
         if ($expected !== null) {

tests/Misc/UtfStringTest.php

@@ -86,7 +86,7 @@ public function testToString(): void
      *
      * @dataProvider utf8StringsProvider
      */
-    public function testAccess(string $text, ?string $pos10, ?string $pos20): void
+    public function testAccess(string $text, string|null $pos10, string|null $pos20): void
     {
         $str = new UtfString($text);
         $this->assertEquals($pos10, $str->offsetGet(10));

tests/Utils/MiscTest.php

@@ -19,7 +19,7 @@ class MiscTest extends TestCase
      *
      * @dataProvider getAliasesProvider
      */
-    public function testGetAliases(string $query, ?string $db, array $expected): void
+    public function testGetAliases(string $query, string|null $db, array $expected): void
     {
         $parser = new Parser($query);
         $statement = empty($parser->statements[0]) ?