Merge pull request #21 from creative-commoners/pulls/1.0/psr-4

Rename file structure for PSR-4 compatibility, update Travis configuration to run phpcs

.scrutinizer.yml

@@ -66,5 +66,5 @@ checks:
     argument_type_checks: true
 
 filter:
-  paths: [code/*, tests/*]
+  paths: [src/*, tests/*]
 

.travis.yml

@@ -4,42 +4,34 @@ sudo: false
 
 language: php
 
-php:
-  - 5.6
-  - 7.0
-
-env:
-  - DB=MYSQL CORE_RELEASE=3.1
-
 matrix:
   include:
     - php: 5.6
-      env: DB=MYSQL CORE_RELEASE=3
-    - php: 5.6
-      env: DB=MYSQL CORE_RELEASE=3.1
-    - php: 5.6
-      env: DB=PGSQL CORE_RELEASE=3.2
-    - php: 5.6
-      env: DB=PGSQL CORE_RELEASE=3.3
-    - php: 5.6
-      env: DB=PGSQL CORE_RELEASE=3.4
-    - php: 5.6
-      env: DB=PGSQL CORE_RELEASE=3.5
-    - php: 5.6
-      env: DB=PGSQL CORE_RELEASE=3.6
+      env: DB=MYSQL CORE_RELEASE=3.5 PHPCS_TEST=1
     - php: 5.6
       env: DB=MYSQL CORE_RELEASE=3.6
-  allow_failures:
     - php: 7.0
+      env: DB=PGSQL CORE_RELEASE=3.6
+    - php: 7.1
+      env: DB=PGSQL CORE_RELEASE=3.6
+    - php: 7.2
+      env: DB=MYSQL CORE_RELEASE=3
 
 before_script:
+  # Init PHP
+  - phpenv rehash
+  - phpenv config-rm xdebug.ini
+
+  # Update and validate composer configuration
   - composer self-update || true
   - composer clear-cache
   - composer validate --strict
+
   - 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
   - composer install
 
 script:
-  - ./vendor/bin/phpunit ./silverstripe-composer-update-checker/tests
+  - vendor/bin/phpunit silverstripe-composer-update-checker/tests
+  - if [[ $PHPCS_TEST ]]; then vendor/bin/phpcs silverstripe-composer-update-checker/src silverstripe-composer-update-checker/tests; fi

README.md

@@ -1,12 +1,19 @@
-# [SilverStripe composer update checker](https://github.com/bringyourownideas/silverstripe-composer-update-checker) <br />[![Build Status](https://api.travis-ci.org/bringyourownideas/silverstripe-composer-update-checker.svg?branch=master)](https://travis-ci.org/bringyourownideas/silverstripe-composer-update-checker) [![Latest Stable Version](https://poser.pugx.org/bringyourownideas/silverstripe-composer-update-checker/version.svg)](https://github.com/bringyourownideas/silverstripe-composer-update-checker/releases) [![Latest Unstable Version](https://poser.pugx.org/bringyourownideas/silverstripe-composer-update-checker/v/unstable.svg)](https://packagist.org/packages/bringyourownideas/silverstripe-composer-update-checker) [![Scrutinizer Code Quality](https://img.shields.io/scrutinizer/g/bringyourownideas/silverstripe-composer-update-checker.svg)](https://scrutinizer-ci.com/g/bringyourownideas/silverstripe-composer-update-checker?branch=master) [![Total Downloads](https://poser.pugx.org/bringyourownideas/silverstripe-composer-update-checker/downloads.svg)](https://packagist.org/packages/bringyourownideas/silverstripe-composer-update-checker) [![License](https://poser.pugx.org/bringyourownideas/silverstripe-composer-update-checker/license.svg)](https://github.com/bringyourownideas/silverstripe-composer-update-checker/blob/master/license.md)
+# [SilverStripe composer update checker](https://github.com/bringyourownideas/silverstripe-composer-update-checker)
+
+[![Build Status](https://api.travis-ci.org/bringyourownideas/silverstripe-composer-update-checker.svg?branch=master)](https://travis-ci.org/bringyourownideas/silverstripe-composer-update-checker)
+[![Latest Stable Version](https://poser.pugx.org/bringyourownideas/silverstripe-composer-update-checker/version.svg)](https://github.com/bringyourownideas/silverstripe-composer-update-checker/releases)
+[![Latest Unstable Version](https://poser.pugx.org/bringyourownideas/silverstripe-composer-update-checker/v/unstable.svg)](https://packagist.org/packages/bringyourownideas/silverstripe-composer-update-checker)
+[![Scrutinizer Code Quality](https://img.shields.io/scrutinizer/g/bringyourownideas/silverstripe-composer-update-checker.svg)](https://scrutinizer-ci.com/g/bringyourownideas/silverstripe-composer-update-checker?branch=master)
+[![Total Downloads](https://poser.pugx.org/bringyourownideas/silverstripe-composer-update-checker/downloads.svg)](https://packagist.org/packages/bringyourownideas/silverstripe-composer-update-checker)
+[![License](https://poser.pugx.org/bringyourownideas/silverstripe-composer-update-checker/license.svg)](https://github.com/bringyourownideas/silverstripe-composer-update-checker/blob/master/license.md)
 
 Checks if any of your composer dependencies needs to be updated.
 
 This module only runs the actual checks and saves the information into a DataObject ("ComposerUpdate") - the display of the information is done using the [SilverStripe Maintenance module](https://github.com/bringyourownideas/silverstripe-maintenance).
 
 ### Requirements
 
-* SilverStripe Framework ^3.0
+* SilverStripe Framework ^3.1
 * SilverStripe QueuedJobs *
 
 ### Installation

composer.json

@@ -37,6 +37,21 @@
         "knplabs/packagist-api": "^1.1",
         "friendsofsilverstripe/silverstripe-maintenance": "^0.3"
     },
+    "require-dev": {
+        "phpunit/phpunit": "^5.7",
+        "squizlabs/php_codesniffer": "^3"
+    },
+    "autoload": {
+        "psr-4": {
+            "BringYourOwnIdeas\\UpdateChecker\\": "src/",
+            "BringYourOwnIdeas\\UpdateChecker\\Tests\\": "tests/"
+        }
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.x-dev"
+        }
+    },
     "replace": {
         "spekulatius/silverstripe-composer-update-checker": "self.version"
     },

phpcs.xml.dist

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ruleset name="SilverStripe">
+    <description>CodeSniffer ruleset for SilverStripe coding conventions.</description>
+
+    <!-- base rules are PSR-2 -->
+    <rule ref="PSR2" >
+        <!-- Current exclusions -->
+        <exclude name="PSR1.Classes.ClassDeclaration.MissingNamespace" />
+    </rule>
+</ruleset>

code/models/ComposerUpdate.php → src/Models/ComposerUpdate.php

@@ -23,8 +23,8 @@ class ComposerUpdate extends DataObject
      */
     private static $summary_fields = array(
         'Name' => 'Package',
-        'Installed',
-        'Available',
+        'Installed' => 'Installed',
+        'Available' => 'Available',
     );
 
     /**