Bug #7, PHP-lint and travis-ci fixes [iet:10993886]

.gitignore

@@ -1,7 +1,9 @@
 # .gitignore
 
+composer.phar
 composer.lock
 /vendor/*
+/node_modules/*
 
 /framework/tables.sql
 /site/config/config.php
@@ -20,4 +22,4 @@ composer.lock
 
 ._git
 
-#End.
+# End.

.travis.yml

@@ -1,17 +1,16 @@
 # see http://about.travis-ci.org/docs/user/languages/php/
 language: php
 php:
-  #- 5.5
-  - 5.6
-  #- 7.0
+  #- 5.6
+  - 7.1
   #- hhvm
 
 git:
   depth: 3
 
 before_install:
-  - composer self-update
-  - composer --version
+  #- composer self-update
+  #- composer --version
 
 install:
   - composer install
@@ -24,7 +23,9 @@ script:
   - composer lint
   - ./vendor/bin/phpcs --standard=./phpcs.xml -n --encoding=utf-8 --extensions=php index.php
 
+after_script: composer test
+
 notifications:
   #- [email protected]
 
-#End.
+# End.

composer.json

@@ -15,7 +15,7 @@
     "source": "https://github.com/IET-OU/jisc-workload"
   },
   "require": {
-    "php": ">=5.4.0"
+    "php": ">= 5.6.0"
   },
   "require-dev": {
     "squizlabs/php_codesniffer": "^2.5",
@@ -30,7 +30,7 @@
       "cp -n site/config/config.DIST.php site/config/config.php"
     ],
     "lint": [
-      "./vendor/bin/parallel-lint --exclude vendor ."
+      "parallel-lint --exclude vendor ."
     ],
     "test": [
       "phpcs --standard=./phpcs.xml -n --encoding=utf-8 --extensions=php framework/base/CController.*",

framework/controllers/CCourseController.php

@@ -42,8 +42,16 @@ function actionView() {
                 }
                 else {
                     $faculties = CFacultyModel::loadByAttributes(array('deleted'=>null,'institutionId'=>$this->application->user->institutionId))->getObjectArray();
-                    if(count($faculties) > 0) $courses = CCourseModel::loadByAttributes(array('deleted'=>null,'facultyId'=>array('in',array_keys($faculties)),array('order by'=>'`created` desc'))->getObjectArray();
-                    else $courses = array();
+
+                    if(count($faculties) > 0) {
+                      $courses = CCourseModel::loadByAttributes(array(
+                        'deleted' => null,
+                        'facultyId' => array('in', array_keys($faculties)),
+                        array('order by' => '`created` desc')
+                      ))->getObjectArray();
+                    } else {
+                      $courses = array();
+                    }
                 }
                 $this->attachViewToRegion('main','course','view',array('courses'=>$courses));
                 $this->render();

framework/views/default/googleAnalytics.php

@@ -4,7 +4,7 @@
 (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
 (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
 m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
 
 ga('create', <?php echo json_encode($analyticsId) ?>, 'auto');
 ga('send', 'pageview');