CI updates

Author: jsirish

.scrutinizer.yml

@@ -14,7 +14,7 @@ tools:
       fixers: []
       enabled: false
       filter:
-            paths: [tests/*,code/*]
+            paths: [tests/*,src/*]
             excluded_paths: []
 coding_style:
   php:
@@ -27,5 +27,11 @@ checks:
         code_rating: true
         duplication: true
 
+build:
+  nodes:
+    analysis:
+      tests:
+        override: [php-scrutinizer-run]
+
 filter:
-    paths: [tests/*,code/*]
+    paths: [tests/*,src/*]

.travis.yml

@@ -1,55 +1,34 @@
-
 language: php
 
-sudo: false
-
-addons:
-  apt:
-    packages:
-      - tidy
-
-before_install:
-  - pip install --user codecov
-
 env:
   global:
-    - DB=MYSQL CORE_RELEASE=4.0
-    - MODULE_PATH=viewable-dataobject
-    - COVERAGE=0
+    - COMPOSER_ROOT_VERSION=4.0.x-dev
+    - CODECOV_TOKEN=
+    - SCRUT_TOKEN=
 
 matrix:
   include:
+    - php: 7.0
+      env: DB=MYSQL PHPUNIT_TEST=1 PHPCS_TEST=1
     - php: 7.1
-      env: DB=SQLITE
-    - php: 7.1
-      env: DB=PGSQL
-    - php: 7.1
-      env: COVERAGE=1
+      env: DB=MYSQL PHPUNIT_COVERAGE_TEST=1
     - php: 5.6
-  allow_failures:
-    - php: 7.1
-      env: DB=SQLITE
-
+      env: DB=MYSQL PHPUNIT_TEST=1
 
 before_script:
+  # Init PHP
   - phpenv rehash
-  - composer self-update || true
-  - git clone git://github.com/silverstripe-labs/silverstripe-travis-support.git ~/travis-support
-  - php ~/travis-support/travis_setup.php --source `pwd` --target ~/builds/ss
-  - cd ~/builds/ss
-  - mv "$MODULE_PATH/phpunit.xml.dist" .
+  - phpenv config-rm xdebug.ini
+  - echo 'memory_limit = 2048M' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
 
-#Execute tests with or without coverage
-script:
-  # Execute tests with no coverage.  This is the fastest option
-  - "if [ \"$COVERAGE\" = \"0\" ]; then vendor/bin/phpunit $MODULE_PATH/tests/; fi"
+  # Install composer dependencies
+  - composer require --prefer-dist --no-update silverstripe-themes/simple:~3.2
+  - composer update --no-suggest --prefer-dist
 
-  # Execute tests with coverage.  Do this for a small
-  - "if [ \"$COVERAGE\" = \"1\" ]; then vendor/bin/phpunit --coverage-clover=coverage.clover $MODULE_PATH/tests/; fi"
+script:
+  - if [[ $PHPUNIT_TEST ]]; then vendor/bin/phpunit; fi
+  - if [[ $PHPUNIT_COVERAGE_TEST ]]; then phpdbg -qrr vendor/bin/phpunit --coverage-clover=coverage.xml && wget https://scrutinizer-ci.com/ocular.phar; fi
+  - if [[ $PHPCS_TEST ]]; then vendor/bin/phpcs src/ tests/; fi
 
-# Upload code coverage when tests pass
 after_success:
-  - "if [ \"$COVERAGE\" = \"1\" ]; then mv coverage.clover ~/build/$TRAVIS_REPO_SLUG/; fi"
-  - cd ~/build/$TRAVIS_REPO_SLUG
-  - wget https://scrutinizer-ci.com/ocular.phar
-  - "if [ \"$COVERAGE\" = \"1\" ]; then travis_retry codecov && travis_retry php ocular.phar code-coverage:upload --format=php-clover coverage.clover; fi"
+  - if [[ $PHPUNIT_COVERAGE_TEST ]]; then bash <(curl -s https://codecov.io/bash) -f coverage.xml -t $CODECOV_TOKEN && travis_retry php ocular.phar code-coverage:upload --format=php-clover --access-token=$SCRUT_TOKEN coverage.xml; fi

README.md

@@ -16,7 +16,7 @@ DataExtension that easily allows a dataobject to be viewed like a Page
 
 ## Requirements
 
-- SilverStripe 3.2
+- SilverStripe ^4.0
 
 ## Installation
 

composer.json

@@ -11,14 +11,15 @@
     "keywords": [
         "silverstripe", "dataobject", "page", "viewable"
     ],
-    "type": "silverstripe-module",
+    "type": "silverstripe-vendormodule",
     "license": "BSD-3-Clause",
     "require": {
-        "silverstripe/cms": "^4.0",
-        "silverstripe/framework": "^4.0"
+        "silverstripe/recipe-cms": "^1.0",
+        "silverstripe/vendor-plugin": "^1.0"
     },
     "require-dev": {
-        "phpunit/PHPUnit": "^5.7"
+        "phpunit/PHPUnit": "^5.7",
+        "squizlabs/php_codesniffer": "*"
     },
     "autoload": {
         "psr-4": {

phpcs.xml.dist

@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<ruleset name="SS4">
+    <description>Coding standard for SilverStripe 4.x</description>
+
+    <!-- Don't sniff third party libraries -->
+    <exclude-pattern>*/vendor/*</exclude-pattern>
+    <exclude-pattern>*/thirdparty/*</exclude-pattern>
+
+    <!-- Show progress and output sniff names on violation, and add colours -->
+    <arg value="sp"/>
+    <arg name="colors"/>
+
+    <!-- Use PSR-2 as a base standard -->
+    <rule ref="PSR2">
+        <!-- Allow classes to not declare a namespace -->
+        <exclude name="PSR1.Classes.ClassDeclaration.MissingNamespace"/>
+
+        <!-- Allow underscores in class names -->
+        <exclude name="Squiz.Classes.ValidClassName.NotCamelCaps"/>
+
+        <!-- Allow non camel cased method names -->
+        <exclude name="PSR1.Methods.CamelCapsMethodName.NotCamelCaps"/>
+    </rule>
+</ruleset>

phpunit.xml.dist

@@ -1,14 +1,14 @@
-<phpunit bootstrap="framework/tests/bootstrap.php" colors="true">
+<phpunit bootstrap="vendor/silverstripe/cms/tests/bootstrap.php" colors="true">
     <testsuite name="viewable-dataobject">
-        <directory>viewable-dataobject/tests</directory>
+        <directory>tests</directory>
     </testsuite>
 
     <filter>
         <whitelist addUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">viewable-dataobject/src/</directory>
+            <directory suffix=".php">src/</directory>
             <exclude>
-                <directory suffix=".php">viewable-dataobject/tests/</directory>
+                <directory suffix=".php">tests/</directory>
             </exclude>
         </whitelist>
     </filter>
-</phpunit>
+</phpunit>