update meta files

bearsunday · Oct 4, 2016 · 06882bd · 06882bd
1 parent e9e98ac
commit 06882bd
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 31 deletions.
diff --git a/.php_cs b/.php_cs
@@ -11,6 +11,8 @@ $config = Symfony\CS\Config\Config::create()
         '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',
@@ -23,6 +25,7 @@ $config = Symfony\CS\Config\Config::create()
         'remove_lines_between_uses',
         'return',
         'single_array_no_trailing_comma',
+        'single_quote',
         'spaces_before_semicolon',
         'spaces_cast',
         'standardize_not_equal',

diff --git a/.travis.yml b/.travis.yml
@@ -1,15 +1,17 @@
-sudo: false
 language: php
 php:
-  - 5.5
   - 5.6
+  - 7.0
   - hhvm
-  - 7
+sudo: false
+cache:
+  directories:
+    - $HOME/.composer/cache
 before_script:
   - composer self-update
   - composer install
 script:
-  - phpunit --coverage-clover=coverage.clover
+  - phpunit
 after_script:
   - wget https://scrutinizer-ci.com/ocular.phar
-  - php ocular.phar code-coverage:upload --format=php-clover coverage.clover
+  - if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then php ocular.phar code-coverage:upload --format=php-clover coverage.clover; fi
diff --git a/phpcs.xml b/phpcs.xml
@@ -1,24 +1,19 @@
 <?xml version="1.0"?>
 <ruleset>
-    <description>The coding standard used for applications using BEAR.Sunday Framework.</description>
+    <!-- 2. General -->
     <rule ref="Generic.NamingConventions.UpperCaseConstantName"/>
     <rule ref="Generic.CodeAnalysis.UnusedFunctionParameter"/>
     <rule ref="Generic.Strings.UnnecessaryStringConcat"/>
+    <!-- Include the whole PSR-2 standard -->
     <rule ref="PSR2">
         <exclude name="Generic.Files.LineLength"/>
-        <exclude name="PSR2.Classes.PropertyDeclaration.Underscore"/>
-        <exclude name="PSR2.Methods.MethodDeclaration.Underscore"/>
     </rule>
     <rule ref="PEAR.Commenting.FunctionComment">
         <exclude name="PEAR.Commenting.FunctionComment.MissingReturn"/>
         <exclude name="PEAR.Commenting.FunctionComment.MissingParamComment"/>
         <exclude name="PEAR.Commenting.FunctionComment.SpacingBeforeTags"/>
         <exclude name="PEAR.Commenting.FunctionComment.MissingParamTag"/>
         <exclude name="PEAR.Commenting.FunctionComment.Missing"/>
-        <exclude name="PEAR.Commenting.FunctionComment.MissingReturn"/>
         <exclude name="PEAR.Commenting.FunctionComment.ParameterCommentsNotAligned"/>
-        <exclude name="PEAR.Commenting.FileComment.Missing"/>
     </rule>
-    <file>src</file>
-    <file>tests</file>
 </ruleset>
diff --git a/phpmd.xml b/phpmd.xml
@@ -1,24 +1,12 @@
 <ruleset
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         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"/>
@@ -28,10 +16,14 @@
     <!--design-->
     <rule ref="rulesets/design.xml/EvalExpression"/>
     <rule ref="rulesets/design.xml/ExitExpression"/>
-     <rule ref="rulesets/design.xml/GotoStatement" />
+    <rule ref="rulesets/design.xml/GotoStatement"/>
     <rule ref="rulesets/design.xml/NumberOfChildren"/>
     <rule ref="rulesets/design.xml/DepthOfInheritance"/>
-    <!-- <rule ref="rulesets/design.xml/CouplingBetweenObjects" /> -->
+    <rule ref="rulesets/design.xml/CouplingBetweenObjects">
+        <properties>
+            <property name="minimum" value="14"/>
+        </properties>
+    </rule>
     <!--naming-->
     <rule ref="rulesets/naming.xml/ConstantNamingConventions"/>
     <rule ref="rulesets/naming.xml/BooleanGetMethodName"/>
@@ -41,10 +33,13 @@
     <rule ref="rulesets/unusedcode.xml/UnusedPrivateField"/>
     <rule ref="rulesets/unusedcode.xml/UnusedPrivateMethod"/>
     <!--controversial-->
+    <rule ref="rulesets/controversial.xml/Superglobals"/>
     <rule ref="rulesets/controversial.xml/CamelCaseClassName"/>
     <rule ref="rulesets/controversial.xml/CamelCasePropertyName"/>
     <rule ref="rulesets/controversial.xml/CamelCaseMethodName"/>
+    <rule ref="rulesets/controversial.xml/CamelCaseParameterName"/>
+    <rule ref="rulesets/controversial.xml/CamelCaseVariableName"/>
     <!--cleancode-->
     <rule ref="rulesets/cleancode.xml/BooleanArgumentFlag"/>
-    <!-- <rule ref="rulesets/cleancode.xml/ElseExpression" /> -->
+    <rule ref="rulesets/cleancode.xml/ElseExpression"/>
 </ruleset>