Merge pull request #91 from koriym/cleanup

Cleanup
bearsunday · Mar 17, 2017 · 5bf8ee9 · 5bf8ee9
2 parents 8b3349b + a2916b6
commit 5bf8ee9
Show file tree

Hide file tree

Showing 132 changed files with 681 additions and 401 deletions.
diff --git a/.php_cs b/.php_cs
@@ -1,38 +1,131 @@
 <?php
-$finder = Symfony\CS\Finder\DefaultFinder::create()
-->in(__DIR__);
 
-$config = Symfony\CS\Config\Config::create()
-->level(Symfony\CS\FixerInterface::PSR2_LEVEL)
-->finder($finder)
-->fixers(
-    [
-        'extra_empty_lines',
-        'no_blank_lines_after_class_opening',
-        'no_empty_lines_after_phpdocs',
-        'operators_spaces',
-        'duplicate_semicolon',
-        'namespace_no_leading_whitespace',
-        'phpdoc_indent',
-        'phpdoc_no_empty_return',
-        'phpdoc_no_package',
-        'phpdoc_params',
-        'phpdoc_separation',
-        'phpdoc_to_comment',
-        'phpdoc_trim',
-        'phpdoc_var_without_name',
-        'remove_leading_slash_use',
-        'remove_lines_between_uses',
-        'return',
-        'single_array_no_trailing_comma',
-        'single_quote',
-        'spaces_before_semicolon',
-        'spaces_cast',
-        'standardize_not_equal',
-        'ternary_spaces',
-        'whitespacy_lines',
-        'ordered_use',
-        'short_array_syntax'
-    ]
-);
-return $config;
+$header = <<<'EOF'
+This file is part of the BEAR.Sunday package.
+
+@license http://opensource.org/licenses/MIT MIT
+EOF;
+
+return \PhpCsFixer\Config::create()
+    ->setRiskyAllowed(true)
+    ->setRules(array(
+        '@PSR2' => true,
+        'header_comment' => ['header' => $header, 'commentType' => 'PHPDoc', 'separate' => 'none'],
+        'array_syntax' => ['syntax' => 'short'],
+        'binary_operator_spaces' => ['align_equals' => false, 'align_double_arrow' => false],
+        'blank_line_after_opening_tag' => true,
+        'blank_line_after_namespace' => false,
+        'blank_line_before_return' => true,
+        'cast_spaces' => true,
+//        'class_keyword_remove' => true,
+        'combine_consecutive_unsets' => true,
+        'concat_space' => ['spacing' => 'one'],
+        'declare_equal_normalize' => true,
+        'declare_strict_types' => false,
+        'dir_constant' => true,
+        'ereg_to_preg' => true,
+        'function_typehint_space' => true,
+        'general_phpdoc_annotation_remove' => true,
+        'hash_to_slash_comment' => true,
+        'heredoc_to_nowdoc' => true,
+        'include' => true,
+        'indentation_type' => true,
+        'is_null' => ['use_yoda_style' => false],
+        'linebreak_after_opening_tag' => true,
+        'lowercase_cast' => true,
+//        'mb_str_functions' => true,
+        'method_separation' => true,
+        'modernize_types_casting' => true,
+        'native_function_casing' => true,
+//        'native_function_invocation' => true,
+        'new_with_braces' => false, //
+        'no_alias_functions' => true,
+        'no_blank_lines_after_class_opening' => true,
+        'no_blank_lines_after_phpdoc' => true,
+        'no_blank_lines_before_namespace' => true,
+        'no_empty_comment' => true,
+        'no_empty_phpdoc' => true,
+        'no_empty_statement' => true,
+        'no_extra_consecutive_blank_lines' => ['break', 'continue', 'curly_brace_block', 'extra', 'parenthesis_brace_block', 'return', 'square_brace_block', 'throw', 'use', 'useTrait'],
+        'no_leading_import_slash' => true,
+        'no_leading_namespace_whitespace' => true,
+        'no_mixed_echo_print' => ['use' => 'echo'],
+        'no_multiline_whitespace_around_double_arrow' => true,
+        'no_multiline_whitespace_before_semicolons' => true,
+        'no_php4_constructor' => false,
+        'no_short_bool_cast' => true,
+        'no_short_echo_tag' => false,
+        'no_singleline_whitespace_before_semicolons' => true,
+        'no_spaces_around_offset' => true,
+        'no_trailing_comma_in_list_call' => true,
+        'no_trailing_comma_in_singleline_array' => true,
+        'no_trailing_whitespace' => true,
+        'no_trailing_whitespace_in_comment' => true,
+        'no_unneeded_control_parentheses' => true,
+        'no_unreachable_default_argument_value' => true,
+        'no_unused_imports' => true,
+        'no_useless_else' => true,
+        'no_useless_return' => true,
+        'no_whitespace_before_comma_in_array' => true,
+        'no_whitespace_in_blank_line' => true,
+        'normalize_index_brace' => true,
+        'not_operator_with_space' => false,
+        'not_operator_with_successor_space' => true,
+        'object_operator_without_whitespace' => true,
+        'ordered_class_elements' => true,
+        'ordered_imports' => true,
+        'php_unit_construct' => true,
+        'php_unit_dedicate_assert' => true,
+        'php_unit_fqcn_annotation' => true,
+        'php_unit_strict' => true,
+//        'phpdoc_add_missing_param_annotation' => true,
+        'phpdoc_align' => true,
+        'phpdoc_annotation_without_dot' => true,
+        'phpdoc_indent' => true,
+        'phpdoc_inline_tag' => true,
+        'phpdoc_no_access' => true,
+        'phpdoc_no_alias_tag' => ['property-read' => 'property', 'property-write' => 'property', 'type' => 'var'],
+        'phpdoc_no_empty_return' => true,
+        'phpdoc_no_package' => true,
+//        'phpdoc_no_useless_inheritdoc' => true,
+        'phpdoc_order' => true,
+        'phpdoc_return_self_reference' => true,
+        'phpdoc_scalar' => true,
+        'phpdoc_separation' => true,
+        'phpdoc_single_line_var_spacing' => true,
+//        'phpdoc_summary' => true,
+        'phpdoc_to_comment' => true,
+        'phpdoc_trim' => true,
+        'phpdoc_types' => true,
+        'phpdoc_var_without_name' => true,
+        'pow_to_exponentiation' => true,
+//        'pre_increment' => true,
+        'protected_to_private' => true,
+        'psr0' => true,
+        'psr4' => true,
+        'random_api_migration' => true,
+        'return_type_declaration' =>  ['space_before' => 'one'],
+        'self_accessor' => true,
+        'short_scalar_cast' => true,
+//        'silenced_deprecation_error' => true,
+//        'simplified_null_return' => true,
+//        'single_blank_line_before_namespace' => true,
+        'single_quote' => true,
+        'space_after_semicolon' => true,
+        'standardize_not_equals' => true,
+//        'strict_comparison' => true,
+        'ternary_operator_spaces' => true,
+        'strict_param' => true,
+        'ternary_to_null_coalescing' => true,
+//        'trailing_comma_in_multiline_array' => true,
+        'trim_array_spaces' => true,
+        'unary_operator_spaces' => true,
+        'whitespace_after_comma_in_array' => true
+    ))
+    ->setFinder(
+        PhpCsFixer\Finder::create()
+            ->exclude('tests/Fake')
+            ->exclude('src-data')
+            ->in(__DIR__)
+    )->setLineEnding("\n")
+    ->setUsingCache(false);
diff --git a/.travis.yml b/.travis.yml
@@ -1,30 +1,24 @@
 language: php
+sudo: false
 php:
   - 5.6
-  - 7.0
+  - 7
   - 7.1
   - hhvm
-sudo: false
 cache:
   directories:
+    - vendor
     - $HOME/.composer/cache
-matrix:
-  include:
-    - php: 5.6
-      env: dependencies=lowest
-    - php: hhvm
-      env: dependencies=lowest
-    - php: 7.0
-      env: dependencies=lowest
-    - php: 7.1
-      env: dependencies=lowest
+env:
+  matrix:
+    - DEPENDENCIES=""
+    - DEPENDENCIES="--prefer-lowest --prefer-stable"
 before_script:
   - composer self-update
-  - if [ -z "$dependencies" ]; then composer install; fi;
-  - if [ "$dependencies" = "lowest" ]; then composer update --prefer-lowest; fi;
+  - composer update $DEPENDENCIES
 script:
- - if [ "$TRAVIS_PHP_VERSION" != "7.1" ]; then vendor/bin/phpunit; fi
- - if [ "$TRAVIS_PHP_VERSION" == "7.1" ]; then vendor/bin/phpunit --coverage-text --coverage-clover=coverage.clover; fi
+  - ./vendor/bin/phpunit --coverage-clover=coverage.clover;
+  - if [ "$TRAVIS_PHP_VERSION" = "7.1" ]; then wget http://cs.sensiolabs.org/download/php-cs-fixer-v2.phar && php php-cs-fixer-v2.phar fix --config=.php_cs -v --dry-run --using-cache=no --path-mode=intersection `git diff --name-only --diff-filter=ACMRTUXB $TRAVIS_COMMIT_RANGE`; fi
+
 after_script:
-  - wget https://scrutinizer-ci.com/ocular.phar
-  - if [ "$TRAVIS_PHP_VERSION" == "7.1" ]; then php ocular.phar code-coverage:upload --format=php-clover coverage.clover; fi
+  - if [ "$TRAVIS_PHP_VERSION" = "7.1" ]; then wget https://scrutinizer-ci.com/ocular.phar && php ocular.phar code-coverage:upload --format=php-clover coverage.clover; fi
diff --git a/composer.json b/composer.json
@@ -49,22 +49,8 @@
         }
     },
     "scripts" :{
-        "test": [
-            "phpmd src text ./phpmd.xml",
-            "phpcs src tests",
-            "phpunit"
-        ],
         "cs-fix": [
-            "php-cs-fixer fix --config-file=./.php_cs",
-            "phpcbf src"
-        ],
-        "build": [
-            "rm -rf ./build; mkdir -p ./build/logs ./build/pdepend ./build/api",
-            "pdepend --jdepend-xml=./build/logs/jdepend.xml --jdepend-chart=./build/pdepend/dependencies.svg --overview-pyramid=./build/pdepend/overview-pyramid.svg src",
-            "phploc --log-csv ./build/logs/phploc.csv src",
-            "phpcs --report=checkstyle --report-file=./build/logs/checkstyle.xml --standard=phpcs.xml src",
-            "apigen generate -s src -d build/api",
-            "@test"
+            "php-cs-fixer fix -v"
         ]
     }
 }
diff --git a/docs/demo/00.min/User.php b/docs/demo/00.min/User.php
@@ -1,5 +1,9 @@
 <?php
-
+/**
+ * This file is part of the BEAR.Sunday package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 use BEAR\Resource\ResourceObject;
 
 class User extends ResourceObject

diff --git a/docs/demo/00.min/run.php b/docs/demo/00.min/run.php
@@ -1,5 +1,9 @@
 <?php
-
+/**
+ * This file is part of the BEAR.Sunday package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 use BEAR\Resource\Module\ResourceModule;
 use BEAR\Resource\ResourceInterface;
 use BEAR\Resource\ResourceObject;
@@ -14,12 +18,12 @@
 $result = $resource->get->object(new User)->withQuery(['id' => 1])->eager->request();
 /* @var $result ResourceObject */
 
-print "code:{$result->code}" . PHP_EOL;
+echo "code:{$result->code}" . PHP_EOL;
 
-print 'headers:' . PHP_EOL;
+echo 'headers:' . PHP_EOL;
 print_r($result->headers) . PHP_EOL;
 
-print 'body:' . PHP_EOL;
+echo 'body:' . PHP_EOL;
 print_r($result->body) . PHP_EOL;
 
 //    code:200

diff --git a/docs/demo/01.basic/Sandbox/src/Resource/App/User.php b/docs/demo/01.basic/Sandbox/src/Resource/App/User.php
@@ -1,5 +1,9 @@
 <?php
-
+/**
+ * This file is part of the BEAR.Sunday package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 namespace Sandbox\Resource\Resource\App;
 
 use BEAR\Resource\Annotation\Link;

diff --git a/docs/demo/01.basic/run.php b/docs/demo/01.basic/run.php
@@ -1,5 +1,9 @@
 <?php
-
+/**
+ * This file is part of the BEAR.Sunday package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 use BEAR\Resource\Module\ResourceModule;
 use BEAR\Resource\ResourceInterface;
 use BEAR\Resource\ResourceObject;
@@ -20,12 +24,12 @@
 }
 
 output: {
-    print "code:{$result->code}" . PHP_EOL;
+    echo "code:{$result->code}" . PHP_EOL;
 
-    print 'headers:' . PHP_EOL;
+    echo 'headers:' . PHP_EOL;
     print_r($result->headers) . PHP_EOL;
 
-    print 'body:' . PHP_EOL;
+    echo 'body:' . PHP_EOL;
     print_r($result->body) . PHP_EOL;
 }
 //code:200

diff --git a/docs/demo/01.basic/scripts/bootstrap.php b/docs/demo/01.basic/scripts/bootstrap.php
@@ -1,5 +1,9 @@
 <?php
-
+/**
+ * This file is part of the BEAR.Sunday package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 use Composer\Autoload\ClassLoader;
 use Doctrine\Common\Annotations\AnnotationRegistry;
 

diff --git a/docs/demo/02.link-self/Sandbox/Resource/App/Blog.php b/docs/demo/02.link-self/Sandbox/Resource/App/Blog.php
@@ -1,5 +1,9 @@
 <?php
-
+/**
+ * This file is part of the BEAR.Sunday package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 namespace Sandbox\Resource\Resource\App;
 
 use BEAR\Resource\ResourceObject;

diff --git a/docs/demo/02.link-self/Sandbox/Resource/App/User.php b/docs/demo/02.link-self/Sandbox/Resource/App/User.php
@@ -1,5 +1,9 @@
 <?php
-
+/**
+ * This file is part of the BEAR.Sunday package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 namespace Sandbox\Resource\Resource\App;
 
 use BEAR\Resource\Annotation\Link;

diff --git a/docs/demo/02.link-self/run.php b/docs/demo/02.link-self/run.php
@@ -1,5 +1,9 @@
 <?php
-
+/**
+ * This file is part of the BEAR.Sunday package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 use BEAR\Resource\Module\HalModule;
 use BEAR\Resource\Module\ResourceModule;
 use BEAR\Resource\ResourceInterface;

diff --git a/docs/demo/02.link-self/scripts/bootstrap.php b/docs/demo/02.link-self/scripts/bootstrap.php
@@ -1,5 +1,9 @@
 <?php
-
+/**
+ * This file is part of the BEAR.Sunday package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 $packageDir = dirname(dirname(dirname(dirname(__DIR__))));
 $loader = require $packageDir . '/vendor/autoload.php';
 require dirname(__DIR__) . '/Sandbox/Resource/App/Blog.php';

diff --git a/docs/demo/03.link-crawl/Sandbox/Resource/App/Author.php b/docs/demo/03.link-crawl/Sandbox/Resource/App/Author.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * This file is part of the BEAR.Sunday package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 namespace Sandbox\Resource\App;
 
 use BEAR\Resource\Annotation\Link;
@@ -17,6 +22,6 @@ class Author extends ResourceObject
      */
     public function onGet($id = null)
     {
-        return is_null($id) ? $this->users : $this->users[$id];
+        return $id === null ? $this->users : $this->users[$id];
     }
 }
diff --git a/docs/demo/03.link-crawl/Sandbox/Resource/App/Meta.php b/docs/demo/03.link-crawl/Sandbox/Resource/App/Meta.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * This file is part of the BEAR.Sunday package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
 namespace Sandbox\Resource\App;
 
 use BEAR\Resource\ResourceObject;