Merge pull request #2 from backdevs/update-deprecated-rules

Update deprecated rules

Author: bogdannbv

phpcs/rulesets/base.xml

@@ -26,27 +26,26 @@
     <!-- Forbid alias functions, i.e. `sizeof()`, `delete()` -->
     <rule ref="Generic.PHP.ForbiddenFunctions">
         <properties>
-            <property name="forbiddenFunctions" type="array"
-                      value="
-                    chop => rtrim,
-                    close => closedir,
-                    delete => unset,
-                    doubleval => floatval,
-                    fputs => fwrite,
-                    ini_alter => ini_set,
-                    is_double => is_float,
-                    is_integer => is_int,
-                    is_long => is_int,
-                    is_null => null,
-                    is_real => is_float,
-                    is_writeable => is_writable,
-                    join => implode,
-                    key_exists => array_key_exists,
-                    pos => current,
-                    show_source => highlight_file,
-                    sizeof => count,
-                    strchr => strstr
-                "/>
+            <property name="forbiddenFunctions" type="array">
+                <element key="chop" value="rtrim"/>
+                <element key="close" value="closedir"/>
+                <element key="delete" value="unset"/>
+                <element key="doubleval" value="floatval"/>
+                <element key="fputs" value="fwrite"/>
+                <element key="ini_alter" value="ini_set"/>
+                <element key="is_double" value="is_float"/>
+                <element key="is_integer" value="is_int"/>
+                <element key="is_long" value="is_int"/>
+                <element key="is_null" value="null"/>
+                <element key="is_real" value="is_float"/>
+                <element key="is_writeable" value="is_writable"/>
+                <element key="join" value="implode"/>
+                <element key="key_exists" value="array_key_exists"/>
+                <element key="pos" value="current"/>
+                <element key="show_source" value="highlight_file"/>
+                <element key="sizeof" value="count"/>
+                <element key="strchr" value="strstr"/>
+            </property>
         </properties>
     </rule>
     <!-- Forbid useless inline string concatenation -->
@@ -63,6 +62,9 @@
     <!-- Forbid `php_sapi_name()` function -->
     <rule ref="Generic.PHP.SAPIUsage"/>
 
+    <!-- Require space after language constructs -->
+    <rule ref="Generic.WhiteSpace.LanguageConstructSpacing"/>
+
     <!-- Forbid comments starting with # -->
     <rule ref="PEAR.Commenting.InlineComment"/>
 
@@ -154,8 +156,6 @@
     <rule ref="Squiz.WhiteSpace.CastSpacing"/>
     <!-- Forbid blank line after function opening brace -->
     <rule ref="Squiz.WhiteSpace.FunctionOpeningBraceSpace"/>
-    <!-- Require space after language constructs -->
-    <rule ref="Squiz.WhiteSpace.LanguageConstructSpacing"/>
     <!-- Require space around logical operators -->
     <rule ref="Squiz.WhiteSpace.LogicalOperatorSpacing"/>
     <!-- Forbid spaces around `->` operator -->

phpcs/rulesets/slevomat.xml

@@ -235,10 +235,12 @@
         <exclude name="SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingTraversableTypeHintSpecification" />
     </rule>
     <!-- Checks format of union type hints. -->
-    <rule ref="SlevomatCodingStandard.TypeHints.UnionTypeHintFormat">
+    <rule ref="SlevomatCodingStandard.TypeHints.DNFTypeHintFormat">
         <properties>
             <!-- Union type must be separated by | without spaces -->
-            <property name="withSpaces" value="no"/>
+            <property name="withSpacesAroundOperators" value="no"/>
+            <!-- Requires nul to be first as in "null|SomeType" instead of "SomeType|null" -->
+            <property name="nullPosition" value="first"/>
         </properties>
     </rule>
     <!-- Reports useless @var annotation (or whole documentation comment) for constants because the type of constant is always clear. -->