設定ファイル修正

webstream-framework · Oct 23, 2017 · 555e088 · 555e088
1 parent 137f24c
commit 555e088
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 17 deletions.
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
@@ -1,5 +1,16 @@
 checks:
     php: true
+build:
+    nodes:
+        analysis:
+            environment:
+                php: 7.0.20
+            tests:
+                override:
+                    - command: phpcs-run
+                      use_website_config: true
+                    - php-scrutinizer-run
+
 filter:
     excluded_paths:
         - 'Test/*'
@@ -8,12 +19,6 @@ tools:
         timeout: 2400
     php_code_coverage:
         enabled: false
-    php_code_sniffer:
-        config:
-            standard: 'PSR2'
-        filter:
-            excluded_paths:
-                - 'Test/*'
     php_cpd:
         excluded_dirs:
             - Test
@@ -31,7 +36,8 @@ tools:
                 - naming
                 - design
             naming_rules:
-                short_variable: { minimum: 2 }
+                short_variable:
+                    minimum: 2
         filter:
             excluded_paths:
                 - 'Test/*'
diff --git a/.travis.yml b/.travis.yml
@@ -5,17 +5,28 @@ services:
 
 language: php
 
+cache:
+  directories:
+    - vendor
+    - $HOME/.composer/cache
+
+matrix:
+  fast_finish: true
+  include:
+    - php: 7.1
+      env: VERSION=latest
+    - php: 7.0
+      env: VERSION=7.0
+
 before_script:
+  - echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
   - composer install
   - mkdir -p build/logs
 
 script:
-  - docker run -v /home/travis/build/webstream-framework/Container:/workspace/ webstream/php-alpine vendor/bin/phpunit --configuration phpunit.xml
+  - if [[ $VERSION = 'latest' ]]; then docker run -v /home/travis/build/webstream-framework/Container:/workspace/ webstream/php-alpine phpdbg -qrr vendor/bin/phpunit --configuration phpunit.xml --coverage-clover=coverage.clover; fi
+  - if [[ $VERSION != 'latest' ]]; then docker run -v /home/travis/build/webstream-framework/Container:/workspace/ webstream/php-alpine phpdbg -qrr vendor/bin/phpunit --configuration phpunit.xml; fi
 
 after_script:
-  - wget https://scrutinizer-ci.com/ocular.phar
-  - php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml
-
-php:
-  - 7.0
-  - 7.1
+  - if [[ $VERSION = 'latest' ]]; then wget https://scrutinizer-ci.com/ocular.phar; fi
+  - if [[ $VERSION = 'latest' ]]; then php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml; fi
diff --git a/phpunit.xml b/phpunit.xml
@@ -7,10 +7,10 @@
   </testsuites>
   <filter>
     <whitelist addUncoveredFilesFromWhitelist="true">
-      <directory>./</directory>
+      <directory suffix=".php">./</directory>
       <exclude>
-        <directory>vendor</directory>
-        <directory>Test</directory>
+        <directory>./Test</directory>
+        <directory>./Modules</directory>
       </exclude>
     </whitelist>
   </filter>