Merge pull request #12 from ray-di/cleanup

Cleanup
ray-di · Jun 23, 2019 · 9b973ad · 9b973ad
2 parents fa290d9 + 69d10e1
commit 9b973ad
Show file tree

Hide file tree

Showing 34 changed files with 247 additions and 188 deletions.
diff --git a/.php_cs.dist b/.php_cs.dist
diff --git a/.php_cs.dist b/.php_cs.dist
@@ -0,0 +1,184 @@
+<?php
+
+/*
+ * PHP Coding Standards Fixer Config file for PHP7.0 and up
+ *
+ * @see https://github.com/FriendsOfPHP/PHP-CS-Fixer/blob/master/README.rst
+ */
+
+$header = <<<'EOF'
+EOF;
+
+$finder = PhpCsFixer\Finder::create()
+    ->exclude(['tests/Fake', 'tests/tmp', 'template'])
+    ->in(__DIR__);
+
+return \PhpCsFixer\Config::create()
+    ->setRiskyAllowed(true)
+    ->setRules([
+        '@PSR2' => true,
+        '@PHP70Migration:risky' => true,
+        'align_multiline_comment' => true,
+        'array_indentation' => true,
+        'array_syntax' => ['syntax' => 'short'],
+        'backtick_to_shell_exec' => true,
+        'binary_operator_spaces' => true, // @Symfony
+        'blank_line_after_opening_tag' => true, // @Symfony
+        'blank_line_before_return' => true,
+        'blank_line_before_statement' => ['statements' => ['break', 'continue', 'declare', 'return', 'throw']], // @Symfony
+        'cast_spaces' => true, // @Symfony
+        'class_attributes_separation' => ['elements' => ['const', 'method']], // @Symfony
+//      'class_keyword_remove' => true,
+        'combine_consecutive_issets' => true,
+        'combine_consecutive_unsets' => true,
+//      'comment_to_phpdoc' => true,
+        'compact_nullable_typehint' => true,
+        'concat_space' => ['spacing' => 'one'], // @Symfony
+//      'date_time_immutable' => true,
+        'declare_equal_normalize' => true, // @Symfony
+        'dir_constant' => true, // @Symfony:risky
+        'ereg_to_preg' => true, // @Symfony:risky
+        'error_suppression' => true, // @Symfony:risky
+        'escape_implicit_backslashes' => true,
+        'explicit_indirect_variable' => true,
+        'explicit_string_variable' => true,
+//      'final_internal_class' => true,
+        'fully_qualified_strict_types' => true,
+        'function_to_constant' => true, // @Symfony:risky
+        'function_typehint_space' => true, // @Symfony
+        'general_phpdoc_annotation_remove' => ['author', 'category', 'package', 'copyright', 'version'],
+        'header_comment' => ['header' => $header, 'comment_type' => 'comment'],
+        'heredoc_to_nowdoc' => true,
+        'include' => true, // @Symfony
+//      'increment_style' => 'pre', // @Symfony
+        'indentation_type' => true,
+        'is_null' => ['use_yoda_style' => false], // @Symfony:risky
+        'linebreak_after_opening_tag' => true,
+//      'list_syntax' => true,
+//      'logical_operators' => true,
+        'lowercase_cast' => true, // @Symfony
+        'lowercase_static_reference' => true, // @Symfony
+        'magic_constant_casing' => true,
+//      'mb_str_functions' => true,
+        'method_chaining_indentation' => true,
+        'method_separation' => true,
+        'modernize_types_casting' => true, // @Symfony:risky
+        'multiline_comment_opening_closing' => true,
+        'multiline_whitespace_before_semicolons' => true,
+//      'native_constant_invocation' => true,
+        'native_function_casing' => true, // @Symfony
+//      'native_function_invocation' => true,
+//      'new_with_braces' => true, // @Symfony
+        'no_alias_functions' => true, // @Symfony:risky
+        'no_alternative_syntax' => true,
+        'no_binary_string' => true,
+        'no_blank_lines_after_class_opening' => true, // @Symfony
+        'no_blank_lines_after_phpdoc' => true, // @Symfony
+//      'no_blank_lines_before_namespace' => true,
+        'no_empty_comment' => true, // @Symfony
+        'no_empty_phpdoc' => true, // @Symfony
+        'no_empty_statement' => true, // @Symfony
+        'no_extra_blank_lines' => true,
+        'no_homoglyph_names' => true, // @Symfony:risky
+        'no_leading_import_slash' => true, // @Symfony
+        'no_leading_namespace_whitespace' => true, // @Symfony
+        'no_mixed_echo_print' => true, // @Symfony
+        'no_multiline_whitespace_around_double_arrow' => true, // @Symfony
+        'no_null_property_initialization' => true,
+        'no_php4_constructor' => true,
+        'no_short_bool_cast' => true, // @Symfony
+        'no_short_echo_tag' => false,
+        'no_singleline_whitespace_before_semicolons' => true, // @Symfony
+        'no_spaces_around_offset' => true, // @Symfony
+        'no_superfluous_elseif' => true,
+        'no_superfluous_phpdoc_tags' => true,
+        'no_trailing_comma_in_list_call' => true, // @Symfony
+        'no_trailing_comma_in_singleline_array' => true, // @Symfony
+        'no_trailing_whitespace' => true,
+        'no_trailing_whitespace_in_comment' => true,
+        'no_unneeded_control_parentheses' => true, // @Symfony
+        'no_unneeded_curly_braces' => true, // @Symfony
+        'no_unneeded_final_method' => true, // @Symfony
+        'no_unreachable_default_argument_value' => true,
+        'no_unset_on_property' => true,
+        'no_unused_imports' => true,
+        'no_useless_else' => true,
+        'no_useless_return' => true,
+        'no_whitespace_before_comma_in_array' => true, // @Symfony
+        'no_whitespace_in_blank_line' => true, // @Symfony
+        'non_printable_character' => true, // @Symfony
+        'normalize_index_brace' => true, // @Symfony
+        'not_operator_with_space' => false,
+        'not_operator_with_successor_space' => true,
+        'object_operator_without_whitespace' => true, // @Symfony
+        'ordered_class_elements' => true,
+        'ordered_imports' => true,
+        'php_unit_construct' => true, // @Symfony:risky
+        'php_unit_dedicate_assert' => true,
+        'php_unit_expectation' => true,
+        'php_unit_fqcn_annotation' => true, // @Symfony
+//      'php_unit_internal_class' => true, // @Symfony]
+//      'php_unit_mock' => true,
+        'php_unit_namespaced' => true,
+        'php_unit_no_expectation_annotation' => true,
+        'php_unit_ordered_covers' => true,
+        'php_unit_set_up_tear_down_visibility' => true,
+        'php_unit_strict' => true,
+//      'php_unit_test_annotation' => true,
+//      'php_unit_test_case_static_method_calls' => true,
+//      'php_unit_test_class_requires_covers' => true,
+//      'phpdoc_add_missing_param_annotation' => true,
+        'phpdoc_align' => true, // @Symfony]
+        'phpdoc_annotation_without_dot' => true, // @Symfony]
+        'phpdoc_indent' => true, // @Symfony]
+        'phpdoc_inline_tag' => true, // @Symfony]
+        'phpdoc_no_access' => true, // @Symfony]
+        'phpdoc_no_alias_tag' => true, // @Symfony
+        'phpdoc_no_empty_return' => true, // @Symfony
+        'phpdoc_no_package' => true, // @Symfony
+//      'phpdoc_no_useless_inheritdoc' => true, // @Symfony
+        'phpdoc_order' => true,
+        'phpdoc_return_self_reference' => true, // @Symfony
+        'phpdoc_scalar' => true, // @Symfony
+        'phpdoc_separation' => true, // @Symfony
+        'phpdoc_single_line_var_spacing' => true, // @Symfony
+//      'phpdoc_summary' => true, // @Symfony
+        'phpdoc_to_comment' => true, // @Symfony
+        'phpdoc_trim' => true, // @Symfony
+        'phpdoc_trim_consecutive_blank_line_separation' => true,
+        'phpdoc_types' => true, // @Symfony
+        'phpdoc_types_order' => true, // @Symfony
+        'phpdoc_var_without_name' => true, // @Symfony
+        'protected_to_private' => true,
+        'psr0' => true,
+        'psr4' => true, // @Symfony:risky
+        'return_assignment' => true,
+        'return_type_declaration' =>  ['space_before' => 'one'],
+        'self_accessor' => true, // @Symfony:risky
+        'semicolon_after_instruction' => true, // @Symfony
+        'set_type_to_cast' => true, // @Symfony:risky
+        'short_scalar_cast' => true, // @Symfony:risky
+//      'simplified_null_return' => true,
+        'single_blank_line_before_namespace' => true, // @Symfony
+//      'single_line_comment_style' => true, // @Symfony
+        'single_line_after_imports' => true,
+        'single_quote' => true, // @Symfony
+        'space_after_semicolon' => true, // @Symfony
+        'standardize_increment' => true, // @Symfony
+        'standardize_not_equals' => true, // @Symfony
+//      'static_lambda' => true,
+//      'strict_comparison' => true,
+        'strict_param' => true,
+//      'string_line_ending' => true,
+        'switch_case_semicolon_to_colon' => true,
+        'switch_case_space' => true,
+        'ternary_operator_spaces' => true,
+//      'trailing_comma_in_multiline_array' => true, // @Symfony
+        'trim_array_spaces' => true, // @Symfony
+        'unary_operator_spaces' => true, // @Symfony
+        'visibility_required' => true,
+//      'void_return' => true, // @PHP71Migration:risky
+        'whitespace_after_comma_in_array' => true, // @Symfony
+//      'yoda_style' => true // @Symfony
+    ])
+    ->setFinder($finder);
diff --git a/composer.json b/composer.json
@@ -18,13 +18,12 @@
         "ext-json": "*",
         "ray/aura-sql-module": "^1.6",
         "guzzlehttp/guzzle": "^6.3",
-        "ray/aop": "^2.8.4"
+        "ray/aop": "^2.8.4",
+        "koriym/query-locator": "^1.4"
     },
     "require-dev": {
-        "phpunit/phpunit": "^6.5",
-        "bear/resource": "^1.9.2",
-        "ray/di": "^2.8.1",
-        "bear/cs": "^1.1"
+        "phpunit/phpunit": "^7.5",
+        "bear/resource": "^1.12"
     },
     "autoload": {
         "psr-4": {

diff --git a/demo/0-manual-injection.php b/demo/0-manual-injection.php
@@ -1,11 +1,6 @@
 <?php
 
 declare(strict_types=1);
-/**
- * This file is part of the Ray.Query.
- *
- * @license http://opensource.org/licenses/MIT MIT
- */
 
 use Aura\Sql\ExtendedPdo;
 use Ray\Query\SqlQueryRowList;

diff --git a/demo/1-constructor-injection.php b/demo/1-constructor-injection.php
@@ -1,11 +1,6 @@
 <?php
 
 declare(strict_types=1);
-/**
- * This file is part of the Ray.Query.
- *
- * @license http://opensource.org/licenses/MIT MIT
- */
 
 use Aura\Sql\ExtendedPdoInterface;
 use Ray\Di\AbstractModule;
@@ -52,8 +47,7 @@ public function create(string $uuid, string $title)
     }
 }
 
-$injector = new Injector(new class extends AbstractModule
-{
+$injector = new Injector(new class extends AbstractModule {
     protected function configure()
     {
         $this->install(new Ray\AuraSqlModule\AuraSqlModule('sqlite::memory:'));

diff --git a/demo/2-alias-query.php b/demo/2-alias-query.php
@@ -4,29 +4,20 @@
 
 namespace Ray\Query;
 
-/**
- * This file is part of the Ray.Query.
- *
- * @license http://opensource.org/licenses/MIT MIT
- */
-
 use Aura\Sql\ExtendedPdoInterface;
 use Ray\AuraSqlModule\AuraSqlModule;
 use Ray\Di\AbstractModule;
 use Ray\Di\Injector;
-use Ray\Query\SqlQueryModule;
 
 require dirname(__DIR__) . '/vendor/autoload.php';
 
 require_once __DIR__ . '/Todo.php';
 
-$injector = new Injector(new class extends AbstractModule
-{
+$injector = new Injector(new class extends AbstractModule {
     protected function configure()
     {
         $this->install(new AuraSqlModule('sqlite::memory:'));
         $this->install(new SqlQueryModule(dirname(__DIR__ . '/sql')));
-        $a = class_exists(Todo::class);
         $this->bind(Todo::class);
     }
 });

diff --git a/demo/Todo.php b/demo/Todo.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace Ray\Query;
@@ -20,4 +21,4 @@ public function get(string $id)
     public function create(string $uuid, string $title)
     {
     }
-}
+}
diff --git a/demo/run.php b/demo/run.php
@@ -1,12 +1,7 @@
 <?php
 
 declare(strict_types=1);
-/**
- * This file is part of the Ray.Query.
- *
- * @license http://opensource.org/licenses/MIT MIT
- */
 
 passthru('php ' . __DIR__ . '/0-manual-injection.php');
 passthru('php ' . __DIR__ . '/1-constructor-injection.php');
-passthru('php ' . __DIR__ . '/2/alias-query.php');
+passthru('php ' . __DIR__ . '/2-alias-query.php');
diff --git a/phpcs.xml b/phpcs.xml
@@ -1,5 +1,6 @@
-<?xml version="1.0"?>
-<ruleset name="PHP Coding Standards">>
+<?xml version="1.0" encoding="UTF-8"?>
+<ruleset name="PHP_CodeSniffer" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/squizlabs/PHP_CodeSniffer/master/phpcs.xsd">
     <rule ref="Generic.NamingConventions.UpperCaseConstantName"/>
     <rule ref="Generic.CodeAnalysis.UnusedFunctionParameter"/>
     <rule ref="Generic.Strings.UnnecessaryStringConcat"/>
@@ -13,5 +14,6 @@
         <exclude name="PEAR.Commenting.FunctionComment.MissingParamTag"/>
         <exclude name="PEAR.Commenting.FunctionComment.Missing"/>
         <exclude name="PEAR.Commenting.FunctionComment.ParameterCommentsNotAligned"/>
+        <exclude name="PEAR.Commenting.FunctionComment.ParamNameNoMatch"/>
     </rule>
 </ruleset>
diff --git a/phpmd.xml b/phpmd.xml
@@ -1,24 +1,13 @@
-<ruleset
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xmlns="http://pmd.sf.net/ruleset/1.0.0"
-        xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0 http://pmd.sf.net/ruleset_xml_schema.xsd"
-        xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<ruleset name="PHPMD rule set"
+         xmlns="http://pmd.sf.net/ruleset/1.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0 http://pmd.sf.net/ruleset_xml_schema.xsd"
+         xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd">
     <!--codesize-->
-    <rule ref="rulesets/codesize.xml/CyclomaticComplexity">
-        <properties>
-            <property name="reportLevel" value="20"/>
-        </properties>
-    </rule>
-    <rule ref="rulesets/codesize.xml/NPathComplexity">
-        <properties>
-            <property name="minimum" value="200"/>
-        </properties>
-    </rule>
-    <rule ref="rulesets/codesize.xml/ExcessiveClassComplexity">
-        <properties>
-            <property name="maximum" value="100"/>
-        </properties>
-    </rule>
+    <rule ref="rulesets/codesize.xml/CyclomaticComplexity"/>
+    <rule ref="rulesets/codesize.xml/NPathComplexity"/>
+    <rule ref="rulesets/codesize.xml/ExcessiveClassComplexity"/>
     <rule ref="rulesets/codesize.xml/ExcessiveClassLength"/>
     <rule ref="rulesets/codesize.xml/ExcessiveMethodLength"/>
     <rule ref="rulesets/codesize.xml/ExcessiveParameterList"/>
@@ -46,5 +35,5 @@
     <rule ref="rulesets/controversial.xml/CamelCaseMethodName"/>
     <!--cleancode-->
     <rule ref="rulesets/cleancode.xml/BooleanArgumentFlag"/>
-    <!-- <rule ref="rulesets/cleancode.xml/ElseExpression" /> -->
+     <rule ref="rulesets/cleancode.xml/ElseExpression" />
 </ruleset>
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,7 +1,10 @@
-<phpunit bootstrap="./tests/bootstrap.php">
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
+         bootstrap="tests/bootstrap.php">
     <testsuites>
-        <testsuite>
-            <directory suffix="Test.php">tests</directory>
+        <testsuite name="all">
+            <directory>tests</directory>
         </testsuite>
     </testsuites>
     <php>

diff --git a/src/Annotation/AliasQuery.php b/src/Annotation/AliasQuery.php
@@ -1,11 +1,7 @@
 <?php
 
 declare(strict_types=1);
-/**
- * This file is part of the Ray.Query.
- *
- * @license http://opensource.org/licenses/MIT MIT
- */
+
 namespace Ray\Query\Annotation;
 
 /**

diff --git a/src/Annotation/GuzzleConfig.php b/src/Annotation/GuzzleConfig.php
@@ -1,11 +1,7 @@
 <?php
 
 declare(strict_types=1);
-/**
- * This file is part of the Ray.Query.
- *
- * @license http://opensource.org/licenses/MIT MIT
- */
+
 namespace Ray\Query\Annotation;
 
 /**