-[](https://packagist.org/packages/phpcsstandards/phpcsextra)
-[](https://travis-ci.com/PHPCSStandards/PHPCSExtra/branches)
+[][phpcsextra-packagist]
[](https://github.com/PHPCSStandards/PHPCSExtra/releases)
:construction:
[](https://packagist.org/packages/phpcsstandards/phpcsextra#dev-develop)
-[](https://travis-ci.com/PHPCSStandards/PHPCSExtra/branches)
[](https://github.com/PHPCSStandards/PHPCSExtra/commits/develop)
-[](https://packagist.org/packages/phpcsstandards/phpcsextra)
-[](https://travis-ci.com/PHPCSStandards/PHPCSExtra)
+[][phpcsextra-packagist]
+[][gha-qa-results]
+[][gha-test-results]
+[][gha-test-results]
[](https://coveralls.io/github/PHPCSStandards/PHPCSExtra)
[](https://github.com/PHPCSStandards/PHPCSExtra/blob/stable/LICENSE)
@@ -25,8 +25,10 @@ PHPCSExtra
* [Installation](#installation)
+ [Composer Project-based Installation](#composer-project-based-installation)
+ [Composer Global Installation](#composer-global-installation)
+ + [Updating to a newer version](#updating-to-a-newer-version)
* [Features](#features)
* [Sniffs](#sniffs)
+ + [Modernize](#modernize)
+ [NormalizedArrays](#normalizedarrays)
+ [Universal](#universal)
* [Contributing](#contributing)
@@ -36,15 +38,15 @@ PHPCSExtra
Introduction
-------------------------------------------
-PHPCSExtra is a collection of sniffs and standards for use with [PHP_CodeSniffer](https://github.com/squizlabs/PHP_CodeSniffer).
+PHPCSExtra is a collection of sniffs and standards for use with [PHP_CodeSniffer][phpcs-gh].
Minimum Requirements
-------------------------------------------
* PHP 5.4 or higher.
-* [PHP_CodeSniffer](https://github.com/squizlabs/PHP_CodeSniffer) version **3.3.1** or higher.
-* [PHPCSUtils](https://github.com/PHPCSStandards/PHPCSUtils) version **1.0.0** or higher.
+* [PHP_CodeSniffer][phpcs-gh] version **3.7.1** or higher.
+* [PHPCSUtils][phpcsutils-gh] version **1.0.0** or higher.
Installation
@@ -52,12 +54,13 @@ Installation
Installing via Composer is highly recommended.
-[Composer](http://getcomposer.org/) will automatically install the project dependencies and register the rulesets from PHPCSExtra and other external standards with PHP_CodeSniffer using the [DealerDirect Composer PHPCS plugin](https://github.com/Dealerdirect/phpcodesniffer-composer-installer/).
+[Composer](http://getcomposer.org/) will automatically install the project dependencies and register the rulesets from PHPCSExtra and other external standards with PHP_CodeSniffer using the [Composer PHPCS plugin][composer-installer-gh].
### Composer Project-based Installation
Run the following from the root of your project:
```bash
+composer config allow-plugins.dealerdirect/phpcodesniffer-composer-installer true
composer require --dev phpcsstandards/phpcsextra:"^1.0"
```
@@ -65,15 +68,36 @@ composer require --dev phpcsstandards/phpcsextra:"^1.0"
Alternatively, you may want to install this standard globally:
```bash
+composer global config allow-plugins.dealerdirect/phpcodesniffer-composer-installer true
composer global require --dev phpcsstandards/phpcsextra:"^1.0"
```
+### Updating to a newer version
+
+If you installed PHPCSExtra using either of the above commands, you can update to a newer version as follows:
+```bash
+# Project local install
+composer update phpcsstandards/phpcsextra --with-dependencies
+
+# Global install
+composer global update phpcsstandards/phpcsextra --with-dependencies
+```
+
+> If your project includes `require[-dev]`s for the `squizlabs/php_codesniffer`, `phpcsstandards/phpcsutils` or
+> `dealerdirect/phpcodesniffer-composer-installer` packages in its `composer.json` file, you may need to use
+> `--with-all-dependencies` instead of `--with-dependencies`.
+>
+> :bulb: **Pro-tip**: Unless your project is a PHPCS standard which actually uses any of these packages directly,
+> it is recommended to remove these packages from your own `composer.json` file, in favour of letting PHPCSExtra
+> (and potential other external PHPCS standards you use), manage the version requirements for these packages.
+
Features
-------------------------------------------
-Once this project is installed, you will see two new rulesets in the list of installed standards when you run `phpcs -i`: `NormalizedArrays` and `Universal`.
+Once this project is installed, you will see three new rulesets in the list of installed standards when you run `vendor/bin/phpcs -i`: `Modernize`, `NormalizedArrays` and `Universal`.
+* The `Modernize` ruleset is a standard which checks code for modernization opportunaties.
* The `NormalizedArrays` ruleset is a standard to check the formatting of array declarations.
* The `Universal` ruleset is **NOT** a standard, but a sniff collection.
It should **NOT** be included in custom rulesets as a standard as it contains contradictory rules.
@@ -85,8 +109,22 @@ Sniffs
**Legend**:
* :wrench: = Includes auto-fixer.
+ _Use the `phpcbf` command to run the fixers._
* :bar_chart: = Includes metrics.
+ _Use `phpcs` with `--report=info` to see the metrics._
* :books: = Includes CLI documentation.
+ _Use `phpcs` with `--generator=Text` to see the documentation._
+
+
+### Modernize
+
+#### `Modernize.FunctionCalls.Dirname` :wrench: :books:
+
+This sniff will detect and auto-fix two typical code modernizations which can be made related to the `dirname()` function:
+1. Since PHP 5.3, calls to `dirname(__FILE__)` can be replaced by `__DIR__`.
+ Errorcode: `Modernize.FunctionCalls.Dirname.FileConstant`.
+2. Since PHP 7.0, nested function calls to `dirname()` can be changed to use the `$levels` parameter.
+ Errorcode: `Modernize.FunctionCalls.Dirname.Nested`.
### NormalizedArrays
@@ -121,9 +159,10 @@ Use any of the following values to change the properties: `enforce`, `forbid` or
The default for the `singleLine` property is `forbid`. The default for the `multiLine` property is `enforce`.
+
### Universal
-#### `Universal.Arrays.DisallowShortArraySyntax` :wrench: :books:
+#### `Universal.Arrays.DisallowShortArraySyntax` :wrench: :bar_chart: :books:
Disallow short array syntax.
@@ -133,14 +172,76 @@ In contrast to the PHPCS native `Generic.Arrays.DisallowShortArraySyntax` sniff,
Detects duplicate array keys in array declarations.
+The sniff will make a distinction between keys which will be duplicate in all PHP version and (numeric) keys which will only be a duplicate key in [PHP < 8.0 or PHP >= 8.0][php-rfc-negative_array_index].
+
+If a [`php_version` configuration option][php_version-config] has been passed to PHPCS using either `--config-set` or `--runtime-set`, it will be respected by the sniff and only report duplicate keys for the configured PHP version.
+
+[php-rfc-negative_array_index]: https://wiki.php.net/rfc/negative_array_index
+[php_version-config]: https://github.com/squizlabs/PHP_CodeSniffer/wiki/Configuration-Options#setting-the-php-version
+
#### `Universal.Arrays.MixedArrayKeyTypes` :books:
-Best practice sniff: don't use a mix of integer and numeric keys for array items.
+Best practice sniff: don't use a mix of integer and string keys for array items.
#### `Universal.Arrays.MixedKeyedUnkeyedArray` :books:
Best practice sniff: don't use a mix of keyed and unkeyed array items.
+#### `Universal.Classes.DisallowAnonClassParentheses` :wrench: :bar_chart: :books:
+
+Disallow the use of parentheses when declaring an anonymous class without passing parameters.
+
+#### `Universal.Classes.RequireAnonClassParentheses` :wrench: :bar_chart: :books:
+
+Require the use of parentheses when declaring an anonymous class, whether parameters are passed or not.
+
+#### `Universal.Classes.DisallowFinalClass` :wrench: :bar_chart: :books:
+
+Disallow classes being declared `final`.
+
+#### `Universal.Classes.RequireFinalClass` :wrench: :bar_chart: :books:
+
+Require all non-`abstract` classes to be declared `final`.
+
+:warning: **Warning**: the auto-fixer for this sniff _may_ have unintended side-effects for applications and should be used with care!
+This is considered a **_risky_ fixer**.
+
+#### `Universal.Classes.ModifierKeywordOrder` :wrench: :bar_chart: :books:
+
+Require a consistent modifier keyword order for class declarations.
+
+* This sniff contains an `order` property to specify the preferred order.
+ Accepted values: (string) `'extendability readonly'`|`'readonly extendability'`. Defaults to `'extendability readonly'`.
+
+#### `Universal.CodeAnalysis.ConstructorDestructorReturn` :wrench: :books:
+
+* Disallows return type declarations on constructor/destructor methods - error code: `ReturnTypeFound`, auto-fixable.
+* Discourages constructor/destructor methods returning a value - error code: `ReturnValueFound`.
+
+#### `Universal.CodeAnalysis.ForeachUniqueAssignment` :wrench: :books:
+
+Detects `foreach` control structures which use the same variable for both the key as well as the value assignment as this will lead to unexpected - and most likely unintended - behaviour.
+
+Note: The fixer will maintain the existing behaviour of the code. This may not be the _intended_ behaviour.
+
+#### `Universal.CodeAnalysis.StaticInFinalClass` :wrench: :books:
+
+Detects using `static` instead of `self` in OO constructs which are `final`.
+
+* The sniff has modular error codes to allow for making exceptions based on the type of use for `static`.
+ The available error codes are: `ReturnType`, `InstanceOf`, `NewInstance`, `ScopeResolution`.
+
+#### `Universal.Constants.LowercaseClassResolutionKeyword` :wrench: :bar_chart: :books:
+
+Enforce that the `class` keyword when used for class name resolution, i.e. `::class`, is in lowercase.
+
+#### `Universal.Constants.ModifierKeywordOrder` :wrench: :bar_chart: :books:
+
+Require a consistent modifier keyword order for OO constant declarations.
+
+* This sniff contains an `order` property to specify the preferred order.
+ Accepted values: (string) `'final visibility'`|`'visibility final'`. Defaults to `'final visibility'`.
+
#### `Universal.Constants.UppercaseMagicConstants` :wrench: :bar_chart: :books:
Enforce uppercase when using PHP native magic constants, like `__FILE__` et al.
@@ -150,18 +251,37 @@ Enforce uppercase when using PHP native magic constants, like `__FILE__` et al.
Disallow using the alternative syntax for control structures.
* This sniff contains an `allowWithInlineHTML` property to allow alternative syntax when inline HTML is used within the control structure. In all other cases, the use of the alternative syntax will still be disallowed.
- Acceped values: (bool) `true`|`false`. Defaults to `false`.
+ Accepted values: (bool) `true`|`false`. Defaults to `false`.
* The sniff has modular error codes to allow for making exceptions based on specific control structures and/or specific control structures in combination with inline HTML.
The error codes follow the following pattern: `Found[ControlStructure][WithInlineHTML]`. Examples: `FoundIf`, `FoundSwitchWithInlineHTML`.
+#### `Universal.ControlStructures.DisallowLonelyIf` :wrench: :books:
+
+Disallow `if` statements as the only statement in an `else` block.
+
+Note: This sniff will not fix the indentation of the "inner" code.
+It is strongly recommended to run this sniff together with the `Generic.WhiteSpace.ScopeIndent` sniff to get the correct indentation.
+
#### `Universal.ControlStructures.IfElseDeclaration` :wrench: :bar_chart: :books:
Verify that else(if) statements with braces are on a new line.
-#### `Universal.Lists.DisallowLongListSyntax` :wrench: :bar_chart: :books:
+#### `Universal.Files.SeparateFunctionsFromOO` :bar_chart: :books:
+
+Enforce for a file to either declare (global/namespaced) functions or declare OO structures, but not both.
+
+* Nested function declarations, i.e. functions declared within a function/method will be disregarded for the purposes of this sniff.
+ The same goes for anonymous classes, closures and arrow functions.
+* Note: This sniff has no opinion on side effects. If you want to sniff for those, use the PHPCS native `PSR1.Files.SideEffects` sniff.
+* Also note: This sniff has no opinion on multiple OO structures being declared in one file.
+ If you want to sniff for that, use the PHPCS native `Generic.Files.OneObjectStructurePerFile` sniff.
+
+#### `Universal.Lists.DisallowLongListSyntax` :wrench: :books:
Disallow the use of long `list`s.
+> For metrics about the use of long lists vs short lists, please use the `Universal.Lists.DisallowShortListSyntax` sniff.
+
#### `Universal.Lists.DisallowShortListSyntax` :wrench: :bar_chart: :books:
Disallow the use of short lists.
@@ -184,9 +304,16 @@ Enforce the use of the alternative namespace syntax using curly braces.
Disallow the use of multiple namespaces within a file.
+#### `Universal.NamingConventions.NoReservedKeywordParameterNames` :books:
+
+Disallow function parameters using reserved keywords as names, as this can quickly become confusing when people use them in function calls using named parameters
+
+* The sniff has modular error codes to allow for making exceptions for specific keywords.
+ The error codes follow the following pattern: `[keyword]Found`.
+
#### `Universal.OOStructures.AlphabeticExtendsImplements` :wrench: :bar_chart: :books:
-Enforce that the names used in a class "implements" statement or an interface "extends" statement are listed in alphabetic order.
+Enforce that the names used in a class/enum "implements" statement or an interface "extends" statement are listed in alphabetic order.
* This sniff contains a `orderby` property to determine the sort order to use for the statement.
If all names used are unqualified, the sort order won't make a difference.
@@ -229,9 +356,19 @@ Enforce the use of strict comparisons.
:warning: **Warning**: the auto-fixer for this sniff _may_ cause bugs in applications and should be used with care!
This is considered a **_risky_ fixer**.
+#### `Universal.Operators.TypeSeparatorSpacing` :wrench: :bar_chart: :books:
+
+Enforce no spaces around the union type and intersection type operators.
+
+The available error codes are: `UnionTypeSpacesBefore`, `UnionTypeSpacesAfter`, `IntersectionTypeSpacesBefore`, `IntersectionTypeSpacesAfter`.
+
+#### `Universal.PHP.OneStatementInShortEchoTag` :wrench: :books:
+
+Disallow short open echo tags ` However, the sister-sniff `Generic.Whitespace.DisallowSpaceIndent` leaves mid-line tabs/spaces alone.
> This sniff fills that gap.
+#### `Universal.WhiteSpace.PrecisionAlignment` :wrench: :books:
+
+Enforce code indentation to always be a multiple of a tabstop, i.e. disallow precision alignment.
+
+Note:
+* This sniff does not concern itself with tabs versus spaces.
+ It is recommended to use the sniff in combination with the PHPCS native `Generic.WhiteSpace.DisallowTabIndent` or the `Generic.WhiteSpace.DisallowSpaceIndent` sniff.
+* When using this sniff with tab-based standards, please ensure that the `tab-width` is set and either don't set the `$indent` property or set it to the tab-width (or a multiple thereof).
+* The fixer works based on "best guess" and may not always result in the desired indentation. Combine this sniff with the `Generic.WhiteSpace.ScopeIndent` sniff for more precise indentation fixes.
+
+The behaviour of the sniff is customizable via the following properties:
+* `indent`: the indent used for the codebase.
+ Accepted values: (int|null) number of spaces. Defaults to `null`.
+ If this property is not set, the sniff will look to the `--tab-width` CLI value.
+ If that also isn't set, the default tab-width of `4` will be used.
+* `ignoreAlignmentBefore`: allows for providing a list of token names for which (preceding) precision alignment should be ignored.
+ Accepted values: (array
) token constant names. Defaults to an empty array.
+ Usage example:
+ ```xml
+
+
+
+
+
+
+
+
+
+
+
+ ```
+* `ignoreBlankLines`: whether or not potential trailing whitespace on otherwise blank lines should be examined or ignored.
+ It is recommended to only set this to `false` if the standard including this sniff does not include the `Squiz.WhiteSpace.SuperfluousWhitespace` sniff (which is included in most standards).
+ Accepted values: (bool)`true`|`false`. Defaults to `true`.
+
Contributing
-------
@@ -289,4 +468,13 @@ If unsure whether the changes you are proposing would be welcome, open an issue
License
-------
-This code is released under the GNU Lesser General Public License (LGPLv3). For more information, visit http://www.gnu.org/copyleft/lesser.html
+This code is released under the GNU Lesser General Public License (LGPLv3). For more information, visit
+
+
+[phpcsextra-packagist]: https://packagist.org/packages/phpcsstandards/phpcsextra
+[gha-qa-results]: https://github.com/PHPCSStandards/PHPCSExtra/actions/workflows/basics.yml
+[gha-test-results]: https://github.com/PHPCSStandards/PHPCSExtra/actions/workflows/test.yml
+
+[phpcs-gh]: https://github.com/squizlabs/PHP_CodeSniffer
+[phpcsutils-gh]: https://github.com/PHPCSStandards/PHPCSUtils
+[composer-installer-gh]: https://github.com/PHPCSStandards/composer-installer
diff --git a/Universal/Docs/Arrays/DisallowShortArraySyntaxStandard.xml b/Universal/Docs/Arrays/DisallowShortArraySyntaxStandard.xml
index e37839e8..4a84b536 100644
--- a/Universal/Docs/Arrays/DisallowShortArraySyntaxStandard.xml
+++ b/Universal/Docs/Arrays/DisallowShortArraySyntaxStandard.xml
@@ -1,4 +1,8 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {};
+$anon = new class($param) {};
+ ]]>
+
+
+ () {};
+ ]]>
+
+
+
diff --git a/Universal/Docs/Classes/DisallowFinalClassStandard.xml b/Universal/Docs/Classes/DisallowFinalClassStandard.xml
new file mode 100644
index 00000000..fd7ddb67
--- /dev/null
+++ b/Universal/Docs/Classes/DisallowFinalClassStandard.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+ class Foo {}
+abstract class Bar implements MyInterface {}
+ ]]>
+
+
+ final class Foo {}
+final class Bar extends MyAbstract {}
+ ]]>
+
+
+
diff --git a/Universal/Docs/Classes/ModifierKeywordOrderStandard.xml b/Universal/Docs/Classes/ModifierKeywordOrderStandard.xml
new file mode 100644
index 00000000..a80ae0da
--- /dev/null
+++ b/Universal/Docs/Classes/ModifierKeywordOrderStandard.xml
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+ final readonly class Foo {}
+abstract readonly class Bar {}
+ ]]>
+
+
+ readonly final class Foo {}
+readonly abstract class Bar {}
+ ]]>
+
+
+
diff --git a/Universal/Docs/Classes/RequireAnonClassParenthesesStandard.xml b/Universal/Docs/Classes/RequireAnonClassParenthesesStandard.xml
new file mode 100644
index 00000000..48fa148e
--- /dev/null
+++ b/Universal/Docs/Classes/RequireAnonClassParenthesesStandard.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+ () {};
+ ]]>
+
+
+ {};
+ ]]>
+
+
+
diff --git a/Universal/Docs/Classes/RequireFinalClassStandard.xml b/Universal/Docs/Classes/RequireFinalClassStandard.xml
new file mode 100644
index 00000000..107b8f41
--- /dev/null
+++ b/Universal/Docs/Classes/RequireFinalClassStandard.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+ final class Foo {}
+final class Bar extends MyAbstract {}
+ ]]>
+
+
+ class Foo {}
+abstract class Bar implements MyInterface {}
+ ]]>
+
+
+
diff --git a/Universal/Docs/CodeAnalysis/ConstructorDestructorReturnStandard.xml b/Universal/Docs/CodeAnalysis/ConstructorDestructorReturnStandard.xml
new file mode 100644
index 00000000..b44b4777
--- /dev/null
+++ b/Universal/Docs/CodeAnalysis/ConstructorDestructorReturnStandard.xml
@@ -0,0 +1,64 @@
+
+
+
+
+
+
+
+
+
+
+ : int {}
+}
+ ]]>
+
+
+
+
+
+
+
+
+
+
+
+ $this;
+ }
+
+ public function __destruct() {
+ // Do something.
+ return false;
+ }
+}
+ ]]>
+
+
+
diff --git a/Universal/Docs/CodeAnalysis/ForeachUniqueAssignmentStandard.xml b/Universal/Docs/CodeAnalysis/ForeachUniqueAssignmentStandard.xml
new file mode 100644
index 00000000..6f9676ee
--- /dev/null
+++ b/Universal/Docs/CodeAnalysis/ForeachUniqueAssignmentStandard.xml
@@ -0,0 +1,26 @@
+
+
+
+
+
+
+
+ $v ) {}
+ ]]>
+
+
+ $k ) {}
+ ]]>
+
+
+
diff --git a/Universal/Docs/CodeAnalysis/StaticInFinalClassStandard.xml b/Universal/Docs/CodeAnalysis/StaticInFinalClassStandard.xml
new file mode 100644
index 00000000..8c5f3bd8
--- /dev/null
+++ b/Universal/Docs/CodeAnalysis/StaticInFinalClassStandard.xml
@@ -0,0 +1,43 @@
+
+
+
+
+
+
+
+ self
+ {
+ $var = self::functionCall();
+ $var = $obj instanceof self;
+ $var = new self;
+ }
+}
+ ]]>
+
+
+ static|false {
+ $var = static::$prop;
+ $var = $obj instanceof static;
+ $var = new static();
+ }
+};
+ ]]>
+
+
+
diff --git a/Universal/Docs/Constants/LowercaseClassResolutionKeywordStandard.xml b/Universal/Docs/Constants/LowercaseClassResolutionKeywordStandard.xml
new file mode 100644
index 00000000..7b61c8fa
--- /dev/null
+++ b/Universal/Docs/Constants/LowercaseClassResolutionKeywordStandard.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
+
+
+ MyClass::CLASS;
+ ]]>
+
+
+
diff --git a/Universal/Docs/Constants/ModifierKeywordOrderStandard.xml b/Universal/Docs/Constants/ModifierKeywordOrderStandard.xml
new file mode 100644
index 00000000..f42483a0
--- /dev/null
+++ b/Universal/Docs/Constants/ModifierKeywordOrderStandard.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
+ final public const FOO = 'foo';
+}
+ ]]>
+
+
+ protected final const BAR = 'foo';
+}
+ ]]>
+
+
+
diff --git a/Universal/Docs/Constants/UppercaseMagicConstantsStandard.xml b/Universal/Docs/Constants/UppercaseMagicConstantsStandard.xml
index 9e737d4c..2a9583fa 100644
--- a/Universal/Docs/Constants/UppercaseMagicConstantsStandard.xml
+++ b/Universal/Docs/Constants/UppercaseMagicConstantsStandard.xml
@@ -1,5 +1,8 @@
-
+
-
+
+
+
+
+
+
+
+ elseif ($bar) {
+ // ...
+}
+
+if ($foo) {
+ // ...
+} else {
+ if ($bar) {
+ // ...
+ }
+
+ doSomethingElse();
+
+}
+
+ ]]>
+
+
+ if ($bar) {
+ // ...
+ } else {
+ // ...
+ }
+}
+ ]]>
+
+
+
diff --git a/Universal/Docs/ControlStructures/IfElseDeclarationStandard.xml b/Universal/Docs/ControlStructures/IfElseDeclarationStandard.xml
index fe3cb9a6..b1506f64 100644
--- a/Universal/Docs/ControlStructures/IfElseDeclarationStandard.xml
+++ b/Universal/Docs/ControlStructures/IfElseDeclarationStandard.xml
@@ -1,5 +1,8 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Universal/Docs/Lists/DisallowLongListSyntaxStandard.xml b/Universal/Docs/Lists/DisallowLongListSyntaxStandard.xml
index d1b0ea61..35475eab 100644
--- a/Universal/Docs/Lists/DisallowLongListSyntaxStandard.xml
+++ b/Universal/Docs/Lists/DisallowLongListSyntaxStandard.xml
@@ -1,4 +1,8 @@
-
+
+
+
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Universal/Docs/OOStructures/AlphabeticExtendsImplementsStandard.xml b/Universal/Docs/OOStructures/AlphabeticExtendsImplementsStandard.xml
index 35b83f3b..f22a7193 100644
--- a/Universal/Docs/OOStructures/AlphabeticExtendsImplementsStandard.xml
+++ b/Universal/Docs/OOStructures/AlphabeticExtendsImplementsStandard.xml
@@ -1,4 +1,8 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ |string $paramA,
+ TypeA&TypeB $paramB
+): int|false {}
+ ]]>
+
+
+ | string $paramA,
+ TypeA & TypeB $paramB
+): int
+ |
+ false {}
+ ]]>
+
+
+
diff --git a/Universal/Docs/PHP/OneStatementInShortEchoTagStandard.xml b/Universal/Docs/PHP/OneStatementInShortEchoTagStandard.xml
new file mode 100644
index 00000000..103ca13e
--- /dev/null
+++ b/Universal/Docs/PHP/OneStatementInShortEchoTagStandard.xml
@@ -0,0 +1,41 @@
+
+
+
+
+
+
+
+