Merge pull request #316 from ucfopen/dev/v2-3-0

Dev/v2.3.0 to master

Author: bagofarms

.gitignore

@@ -11,3 +11,5 @@ config/localConfig.php
 vendor
 reports
 assets/js/vendor/
+
+config/log.log

.travis.yml

@@ -4,11 +4,14 @@ cache:
     - $COMPOSER_CACHE_DIR
     - vendor
 install:
-  - 'composer install --no-scripts'
+  - 'composer install'
 php:
   - '5.4'
   - '5.5'
   - '5.6'
-script: 
-  - 'find . -type f -iname "*.php" -not -path "./lib/quail/tests/*" -not -path "./vendor/*" | xargs -n1 php -l'
-  - './vendor/phpunit/phpunit/phpunit --testsuite "UDOIT"'
+  - '7.0'
+  - '7.1'
+script:
+  - 'composer lint'
+  - 'composer sniff-summary'
+  - 'composer test'

CONTRIBUTING.md

@@ -47,7 +47,7 @@ If you are outside of UCF, you will need to fork the UDOIT project in order to w
 
 ### Dev Branches
 
-* Naming Convention: `dev/v1.2.10` - a new one for every upcoming release version
+* Naming Convention: `dev/v1-2-10` - a new one for every upcoming release version. (Note: Hyphens are used instead of periods to preserve compatibility with the Heroku button.)
 * Issue branches merge into this branch (never master)
 * When this dev branch is ready for release, it is merged into master and deleted
 
@@ -81,8 +81,8 @@ This section is mainly for the project managers, but is here for documentation p
     release        ◄── merge         ◄── merge
 
   	tags:          branches:        branches:
-    v0.0.3   ◄──   dev/v0.0.3  ◄──  issue/123-fix-broken-links + issue/211
-    v0.0.2   ◄──   dev/v0.0.2  ◄──  issue/251-rename-all-the-files + issue/222 + issue/12221
-    v0.0.1   ◄──   dev/v0.0.1  ◄──  issue/121-get-logins-working-again
+    v0.0.3   ◄──   dev/v0-0-3  ◄──  issue/123-fix-broken-links + issue/211
+    v0.0.2   ◄──   dev/v0-0-2  ◄──  issue/251-rename-all-the-files + issue/222 + issue/12221
+    v0.0.1   ◄──   dev/v0-0-1  ◄──  issue/121-get-logins-working-again
 
 ```

HEROKU.md

@@ -124,4 +124,9 @@ If you need to check that the tables exist, you can connect to Postgres using so
 If needed, you can manually run the table creation script: `heroku run composer dbsetup`
 
 ## Table Schema
-The table schema can be found in [bin/db_create_tables.php](bin/db_create_tables.php)
+The table schema can be found in [migrations/](migrations/)
+
+# FAQ
+
+## Why aren't my scans completing?
+If you are using the free tier, you may need to manually turn on the worker dyno.  You can do this by going to the [Heroku Control Panel](https://dashboard.heroku.com/apps), selecting your instance of UDOIT, clicking **Configure Dynos**, clicking the pencil icon next to the **Worker** dyno, clicking the slider to the **on** position, then clicking **Confirm**.

Procfile

@@ -1 +1,2 @@
 web: vendor/bin/heroku-php-apache2 public/
+worker: php lib/worker.php

README.md

@@ -51,7 +51,7 @@ To start the Heroku deployment process, you can click the button below, please n
 
 ## System Requirements
 * Apache or Nginx webserver
-* PHP 5.4, 5.5, or 5.6 (some users have modified the code to work on 5.3)
+* PHP 5.4, 5.5, 5.6, 7.0, 7.1 (some users have modified the code to work on 5.3)
   * [GD Graphics Library](http://php.net/manual/en/book.image.php)
 * MySQL or PostgreSQL
 
@@ -125,7 +125,7 @@ Edit `config/localConfig.php`:
 To create the required tables, run the creation script below.  You'll need to complete the db steps above first.
 
 ```
-$ php composer.phar dbsetup
+$ php composer.phar db-setup
 ```
 
 The table schema can be found in [bin/db_create_tables.php](bin/db_create_tables.php)
@@ -261,7 +261,7 @@ For quick local development, set `$UDOIT_ENV = ENV_DEV;` in `config/localConfig.
 From the public directory, run:
 
 ```
-$ php -S localhost:8000
+$ php composer.phar start
 ```
 
 Then open [http://localhost:8000 in a browser](http://localhost:8000).
@@ -270,13 +270,19 @@ Then open [http://localhost:8000 in a browser](http://localhost:8000).
 We use phpunit to run unit tests on UDOIT.  To run the tests, type the following command:
 
 ```
-$ ./vendor/phpunit/phpunit/phpunit
+$ php composer.phar test
+```
+
+We included a Dockerfile, docker-compose.yml, and tests script to run your tests in a predictable environment.  To run tests using docker run this command:
+
+```
+$ php composer.phar docker-test
 ```
 
-By default, phpunit will run all tests, including the functional tests that require access to outside APIs.  If you would like to exclude those tests, run this command:
+By default, we exclude functional tests that include external APIs.  If you would like to run those tests, run this command:
 
 ```
-$ ./vendor/phpunit/phpunit/phpunit --exclude-group functional
+$ ./vendor/phpunit/phpunit/phpunit
 ```
 
 ## Contributors

app.json

@@ -10,9 +10,19 @@
     "Instructure",
     "508"
   ],
-  "website": "http://online.ucf.edu/teach-online/resources/udoit/",
+  "website": "https://cdl.ucf.edu/initiatives/udoit/",
   "repository": "https://github.com/ucfopen/UDOIT",
   "success_url": "/",
+  "formation": {
+    "web": {
+      "quantity": 1,
+      "size": "free"
+    },
+    "worker": {
+      "quantity": 1,
+      "size": "free"
+    }
+  },
   "env": {
     "CONSUMER_KEY": {
       "description": "LTI consumer key entered when adding UDOIT LTI to Canvas",
@@ -43,6 +53,10 @@
     "CANVAS_NAV_ITEM_NAME" : {
       "description": "The text displayed in the canvas navigation menu to launch this app",
       "value": "UDOIT"
+    },
+    "WORKER_ENABLED": {
+      "description": "Enable the background worker (requires you turn on the worker dyno).",
+      "value": "true"
     }
   },
   "addons": [
@@ -54,6 +68,6 @@
     }
   ],
   "scripts": {
-    "postdeploy": "composer dbsetup"
+    "postdeploy": "composer db-setup"
   }
-}
+}

bin/db_create_tables.php

@@ -0,0 +1,11 @@
+<?php
+
+require_once(__DIR__.'/../config/settings.php');
+$migrations_dir = __DIR__.'/../migrations';
+
+$files = scandir($migrations_dir, SCANDIR_SORT_ASCENDING);
+$files = array_diff($files, ['..', '.']);
+
+foreach ($files as $file) {
+    include($migrations_dir.DIRECTORY_SEPARATOR.$file);
+}