Merge branch 'exussum12-addTravisChecks'

Author: Mark Railton

.travis.yml

@@ -0,0 +1,18 @@
+language: php
+dist: trusty
+cache:
+  directories:
+    - $HOME/.composer/cache/files
+    - $HOME/.cache/composer/files
+matrix:
+  include:
+    - php: 5.6
+  fast_finish: true
+before_script:
+  - composer global require squizlabs/php_codesniffer 
+  - composer global require phpunit/phpunit
+  - composer global require jakub-onderka/php-parallel-lint
+  - composer install
+  - cp src/config.php.dist src/config.php
+script:
+- PATH=$HOME/.composer/vendor/bin:$PATH ./build.sh

build.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+set -e
+
+parallel-lint --exclude vendor .
+
+phpcs \
+    --standard=tools/codesniffer/JoindInPSR2/ruleset.xml \
+    --ignore=**/config.php,**/database.php,vendor,tools,tests/bootstrap.php \
+    --extensions=php \
+    --runtime-set ignore_warnings_on_exit true \
+    -p \
+    .
+
+cd tests
+phpunit

scripts/password-migration.php

@@ -1,6 +1,6 @@
 <?php
 
-$db = new PDO("mysql:host=localhost;dbname=joindin", "root", NULL);
+$db = new PDO("mysql:host=localhost;dbname=joindin", "root", null);
 
 $update_sql = "update user set password = :password where ID = :id";
 $update_stmt = $db->prepare($update_sql);
@@ -10,11 +10,10 @@
 $select_stmt->execute();
 
 $count = 0;
-while($row = $select_stmt->fetch(PDO::FETCH_ASSOC)) {
+while ($row = $select_stmt->fetch(PDO::FETCH_ASSOC)) {
     $update_stmt->execute(array("password" => password_hash($row['password'], PASSWORD_DEFAULT),
         "id" => $row['ID']));
     $count++;
 }
 
 echo $count . " rows processed\n";
-

scripts/patchdb.php

@@ -18,7 +18,6 @@
 
 // No options? Let's help out...
 if (!$options || count($options) == 0) {
-    
     echo <<<HELPTEXT
 
 
@@ -85,23 +84,24 @@
 }
 
 
-$baseMysqlCmd = "mysql -u{$options['u']} " 
+$baseMysqlCmd = "mysql -u{$options['u']} "
     . ($options['p'] ? "-p{$options['p']} " : "")
     . "{$options['d']}";
 
 
 ///////////////////////////////////////////////
 // Try getting the max patch_level so far
 
-exec($baseMysqlCmd . ' -r '
+exec(
+    $baseMysqlCmd . ' -r '
     . '-e "select max(patch_number) as num from `' . $options['d'] . '`.patch_history',
     $res
 );
 
 $maxPatchNum = 0;
 if ($res && array_key_exists(1, $res) && $res[1] > 0) {
     $maxPatchNum = $res[1];
-} else if (is_array($res) && count($res) === 0) {
+} elseif (is_array($res) && count($res) === 0) {
     $maxPatchNum = false;
 }
 
@@ -115,7 +115,6 @@
 // Initialise db
 //////////////////////////////////////////////
 if (array_key_exists('i', $options)) {
-
     if (!file_exists($options['t'] . DIRECTORY_SEPARATOR . 'init_db.sql')) {
         echo "Couldn't find the init_db.sql file to initialise db";
         exit;
@@ -133,17 +132,15 @@
 /////////////////////////////////////////////
 
 // First, look through the directory for patch123.sql files
-// and get all the {123} numbers, so we can run them all 
+// and get all the {123} numbers, so we can run them all
 // in order.
 $matchedNums = array();
 if ($dh = opendir($options['t'])) {
     while (($file = readdir($dh)) !== false) {
-        
         preg_match("/patch([\d]+)\.sql/", $file, $matches);
         if ($matches && array_key_exists(1, $matches) && $matches[1] > $maxPatchNum) {
             $matchedNums[] = (int)$matches[1];
         }
-
     }
     closedir($dh);
 }
@@ -160,10 +157,3 @@
 }
 
 echo "\nAll done\n";
-
-
-
-
-
-
-

tests/bootstrap.php

@@ -25,3 +25,5 @@ public function __construct()
         // the constructor in mockPDO.
     }
 }
+
+class_alias(mockPDO::class, 'JoindinTest\Inc\mockPDO');

tests/controllers/Event_hostsControllerTest.php renamed to tests/controllers/EventHostsControllerTest.php

@@ -4,7 +4,7 @@
 
 use Mockery as M;
 
-class Event_hostsControllerTest extends \PHPUnit_Framework_TestCase
+class EventHostsControllerTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * @expectedException \Exception

tests/inc/RequestTest.php

@@ -940,24 +940,3 @@ public function testGettingConfigValues()
         $this->assertEquals('Foo', $request->getConfigValue('Bar', 'Foo'));
     }
 }
-
-/**
- * Class to allow for mocking PDO to send to the OAuthModel
- */
-class mockPDO extends \PDO
-{
-    /**
-     * Constructor that does nothing but helps us test with fake database
-     * adapters
-     */
-    public function __construct()
-    {
-        // We need to do this crap because PDO has final on the __sleep and
-        // __wakeup methods. PDO requires a parameter in the constructor but we don't
-        // want to create a real DB adapter. If you tell getMock to not call the
-        // original constructor, it fakes stuff out by unserializing a fake
-        // serialized string. This way, we've got a "PDO" object but we don't need
-        // PHPUnit to fake it by unserializing a made-up string. We've neutered
-        // the constructor in mockPDO.
-    }
-}

tools/dbgen/generate.php

@@ -15,12 +15,12 @@
 //    define("COUNT_TALK_COMMENTS",    50);
 
 //    // Medium: enough for development purposes without stressing out your DB
-    define("COUNT_USERS",            50);
-    define("COUNT_EVENTS",          100);
-    define("COUNT_EVENT_COMMENTS",  200);
-    define("COUNT_TRACKS",          150);
-    define("COUNT_TALKS",           500);
-    define("COUNT_TALK_COMMENTS",  1000);
+    define("COUNT_USERS", 50);
+    define("COUNT_EVENTS", 100);
+    define("COUNT_EVENT_COMMENTS", 200);
+    define("COUNT_TRACKS", 150);
+    define("COUNT_TALKS", 500);
+    define("COUNT_TALK_COMMENTS", 1000);
 
 //    // Heavy: simulates current production values I think
 //    define("COUNT_USERS",            200);
@@ -72,7 +72,7 @@
     define("COMMENT_IS_PRIVATE", 5);
 
     // Percentage of talks that is claimed
-    define("TALK_IS_CLAIMED",75);
+    define("TALK_IS_CLAIMED", 75);
 
     // Does the talk have multiple speakers
     define("TALK_HAS_MULTIPLE_SPEAKERS", 20);
@@ -102,5 +102,3 @@
     $gen = new DataGenerator(new Generator_Data());
     echo $gen->generate();
     exit;
-
-?>