Merge 68e2d50 into 5c0213c

.php-cs-fixer.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of TYPO3 Surf.
  *
@@ -15,12 +17,12 @@
 // Define in which folders to search and which folders to exclude
 // Exclude some directories that are excluded by Git anyways to speed up the sniffing
 $finder = PhpCsFixer\Finder::create()
-                           ->exclude('var')
-                           ->exclude('.github')
-                           ->exclude('Configuration')
-                           ->exclude('Documentation')
-                           ->exclude('vendor')
-                           ->in(__DIR__);
+    ->exclude('var')
+    ->exclude('.github')
+    ->exclude('Configuration')
+    ->exclude('Documentation')
+    ->exclude('vendor')
+    ->in(__DIR__);
 
 // Return a Code Sniffing configuration using
 // all sniffers needed for PSR-2
@@ -32,42 +34,43 @@
 //  - Ensure Concatenation to have at least one whitespace around
 //  - Remove trailing whitespace at the end of blank lines.
 return (new Config())
-                        ->setUsingCache(true)
-                        ->setRiskyAllowed(true)
-                        ->setRules(array(
-                            '@PSR2' => true,
-                            'no_leading_import_slash' => true,
-                            'no_trailing_comma_in_singleline_array' => true,
-                            'no_singleline_whitespace_before_semicolons' => true,
-                            'no_unused_imports' => true,
-                            'concat_space' => ['spacing' => 'one'],
-                            'no_whitespace_in_blank_line' => true,
-                            'ordered_imports' => true,
-                            'single_quote' => true,
-                            'no_empty_statement' => true,
-                            'no_extra_blank_lines' => true,
-                            'phpdoc_no_package' => true,
-                            'phpdoc_scalar' => true,
-                            'no_blank_lines_after_phpdoc' => true,
-                            'array_syntax' => ['syntax' => 'short'],
-                            'whitespace_after_comma_in_array' => true,
-                            'function_typehint_space' => true,
-                            'single_line_comment_style' => true,
-                            'no_alias_functions' => true,
-                            'lowercase_cast' => true,
-                            'no_leading_namespace_whitespace' => true,
-                            'native_function_casing' => true,
-                            'no_short_bool_cast' => true,
-                            'no_unneeded_control_parentheses' => true,
-                            'phpdoc_no_empty_return' => true,
-                            'phpdoc_trim' => true,
-                            'no_superfluous_elseif' => true,
-                            'no_useless_else' => true,
-                            'phpdoc_types' => true,
-                            'phpdoc_types_order' => ['null_adjustment' => 'always_last', 'sort_algorithm' => 'alpha'],
-                            'return_type_declaration' => ['space_before' => 'none'],
-                            'cast_spaces' => ['space' => 'none'],
-                            'declare_equal_normalize' => ['space' => 'single'],
-                            'dir_constant' => true,
-                        ))
-                        ->setFinder($finder);
+    ->setUsingCache(true)
+    ->setRiskyAllowed(true)
+    ->setRules([
+        '@PSR2' => true,
+        'no_leading_import_slash' => true,
+        'no_trailing_comma_in_singleline_array' => true,
+        'no_singleline_whitespace_before_semicolons' => true,
+        'no_unused_imports' => true,
+        'concat_space' => ['spacing' => 'one'],
+        'no_whitespace_in_blank_line' => true,
+        'ordered_imports' => true,
+        'single_quote' => true,
+        'no_empty_statement' => true,
+        'no_extra_blank_lines' => true,
+        'phpdoc_no_package' => true,
+        'phpdoc_scalar' => true,
+        'no_blank_lines_after_phpdoc' => true,
+        'array_syntax' => ['syntax' => 'short'],
+        'whitespace_after_comma_in_array' => true,
+        'function_typehint_space' => true,
+        'single_line_comment_style' => true,
+        'no_alias_functions' => true,
+        'lowercase_cast' => true,
+        'no_leading_namespace_whitespace' => true,
+        'native_function_casing' => true,
+        'no_short_bool_cast' => true,
+        'no_unneeded_control_parentheses' => true,
+        'phpdoc_no_empty_return' => true,
+        'phpdoc_trim' => true,
+        'no_superfluous_elseif' => true,
+        'no_useless_else' => true,
+        'phpdoc_types' => true,
+        'phpdoc_types_order' => ['null_adjustment' => 'always_last', 'sort_algorithm' => 'alpha'],
+        'return_type_declaration' => ['space_before' => 'none'],
+        'cast_spaces' => ['space' => 'none'],
+        'declare_equal_normalize' => ['space' => 'single'],
+        'dir_constant' => true,
+        'declare_strict_types' => true,
+    ])
+    ->setFinder($finder);

ruleset.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<ruleset name="surf">
+    <!-- relative path from PHPCS source location -->
+    <config name="installed_paths" value="vendor/slevomat/coding-standard"/>
+
+    <!-- include all sniffs in the PSR2 standard -->
+    <rule ref="PSR2"/>
+
+    <rule ref="vendor/slevomat/coding-standard/SlevomatCodingStandard/Sniffs/Namespaces/AlphabeticallySortedUsesSniff.php">
+        <properties>
+            <property name="caseSensitive" value="true"/>
+        </properties>
+    </rule>
+
+    <!-- specific sniffs to include -->
+    <rule ref="vendor/slevomat/coding-standard/SlevomatCodingStandard/Sniffs/TypeHints/DeclareStrictTypesSniff.php">
+        <properties>
+            <property name="newlinesCountBetweenOpenTagAndDeclare" value="2"/>
+            <property name="newlinesCountAfterDeclare" value="2"/>
+            <property name="spacesCountAroundEqualsSign" value="0"/>
+        </properties>
+    </rule>
+</ruleset>

src/Application/BaseApplication.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 namespace TYPO3\Surf\Application;
 
 /*

src/Application/Neos/Flow.php

@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types = 1);
+
 namespace TYPO3\Surf\Application\Neos;
 
 /*

src/Application/Neos/Neos.php

@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types = 1);
+
 namespace TYPO3\Surf\Application\Neos;
 
 /*

src/Application/TYPO3/CMS.php

@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types = 1);
+
 namespace TYPO3\Surf\Application\TYPO3;
 
 /*

src/Cli/Symfony/CompilerPasses/CommandsToApplicationCompilerPass.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types = 1);
 
 namespace TYPO3\Surf\Cli\Symfony\CompilerPasses;

src/Cli/Symfony/ConsoleApplication.php

@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types = 1);
+
 namespace TYPO3\Surf\Cli\Symfony;
 
 /*

src/Cli/Symfony/ConsoleOutputFactory.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types = 1);
 
 namespace TYPO3\Surf\Cli\Symfony;

src/Cli/Symfony/Logger/ConsoleFormatter.php

@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types = 1);
+
 namespace TYPO3\Surf\Cli\Symfony\Logger;
 
 /*

src/Cli/Symfony/Logger/ConsoleHandler.php

@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types = 1);
+
 namespace TYPO3\Surf\Cli\Symfony\Logger;
 
 /*

src/Cli/Symfony/Logger/LoggerFactory.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types = 1);
 
 namespace TYPO3\Surf\Cli\Symfony\Logger;

src/Command/DeployCommand.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 namespace TYPO3\Surf\Command;
 
 /*

src/Command/DescribeCommand.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 namespace TYPO3\Surf\Command;
 
 /*

src/Command/RollbackCommand.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 namespace TYPO3\Surf\Command;
 
 /*

src/Command/SelfUpdateCommand.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 namespace TYPO3\Surf\Command;
 
 /*

src/Command/ShowCommand.php

@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types = 1);
+
 namespace TYPO3\Surf\Command;
 
 /*

src/Command/SimulateCommand.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 namespace TYPO3\Surf\Command;
 
 /*

src/DeprecationMessageFactory.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 namespace TYPO3\Surf;
 
 /*

src/Domain/Clock/ClockException.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 namespace TYPO3\Surf\Domain\Clock;
 
 /*

src/Domain/Clock/ClockInterface.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 namespace TYPO3\Surf\Domain\Clock;
 
 /*