Merge pull request #409 from ucfopen/dev/v2-5-0

Version 2.5.0

Author: bagofarms

.travis.yml

@@ -6,11 +6,10 @@ cache:
 install:
   - 'composer install'
 php:
-  - '5.6'
-  - '7.0'
   - '7.1'
   - '7.2'
 script:
   - 'composer lint'
   - 'composer sniff-summary'
+  - 'composer sniff-errors-only'
   - 'composer test'

HEROKU.md

@@ -21,6 +21,7 @@ After clicking the Heroku button above:
 6. (optional) Copy and paste your Google/YouTube API key into the `GOOGLE_API_KEY` field.
 7. (optional) Copy and paste your Vimeo API key into the `VIMEO_API_KEY` field.
 8. (optional) If you have a Google Analytics account, you can paste your site tracking code into the `GA_TRACKING_CODE` field.
+9. (optional) If you would like to enable the Admin Panel, change the `ADMIN_PANEL_ENABLED` field to `true`.
 8. Click the Deploy button and wait for the process to complete.
 
 ### Step 3:  Request a Developer Key

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.6, 7.0, 7.1, 7.2
+* PHP 7.1, 7.2 (Not yet compatible with 7.3.  See issue #422)
   * [GD Graphics Library](http://php.net/manual/en/book.image.php)
 * MySQL or PostgreSQL
 
@@ -115,6 +115,7 @@ Edit `config/localConfig.php`:
 * `$db_name` -  The database name that contains the tables
 * `$db_user_table` - Default is 'users', no change needed unless you change the table names
 * `$db_reports_table`: - Default is 'reports', no change needed unless you change the table names
+* `$db_job_queue_table`: - Default is 'job_queue', no change needed unless you change the table names
 
 ### Installing Database Tables
 
@@ -178,6 +179,9 @@ If you do not provide a Vimeo API key, a warning log will be recorded in `config
 ### Google Analytics
 If you would like to use Google Analytics for tracking usage of UDOIT, create a new tracking code and add it to `config/localConfig.php` in the `define('GA_TRACKING_CODE', '');` statement.  For example, if your tracking code is `UA-12345678-1`, that line should look like `define('GA_TRACKING_CODE', 'UA-12345678-1');` when you're done.
 
+### Admin Panel
+As of 2.5.0, the admin panel is still an experimental feature.  Consider it a first draft of what we'd like it to be.  It lets you view reports across your institution, generate statistics about reports and user growth, and administer user accounts.  This feature is disabled by default.  To enable it, change `$admin_panel_enabled` to `true`.
+
 ### Installing the LTI in Canvas
 Log into Canvas to add UDOIT:
 

app.json

@@ -73,6 +73,10 @@
     "ALT_TEXT_LENGTH_LIMIT": {
       "description": "Maximum character length for alt-text before the item gets flagged as a warning.",
       "value": "125"
+    },
+    "ADMIN_PANEL_ENABLED": {
+      "description": "Enable the Admin Panel feature.  False disables access and removes the block from the configuration XML.",
+      "value": "false"
     }
   },
   "addons": [

composer.json

@@ -52,27 +52,28 @@
         }
     ],
     "require": {
-        "php": "^5.6.0 || ^7.0.0 || ^7.1.0 || ^7.2.0",
+        "php": "~7.1.0 || ~7.2.0",
         "ext-pdo": "*",
         "ext-gd": "*",
-        "nategood/httpful": "^0.2.20",
-        "zaininnari/html-minifier": "^0.4.2",
+        "nategood/httpful": "~0.2.20",
+        "zaininnari/html-minifier": "~0.4.2",
         "mpdf/mpdf": "6.1.3",
-        "league/plates": "^3.1.1",
-        "monolog/monolog": "^1.21",
+        "league/plates": "~3.1.1",
+        "monolog/monolog": "~1.21",
         "mnsami/composer-custom-directory-installer": "1.1.*",
-        "EastDesire/jscolor":"1.4.2"
+        "eastdesire/jscolor":"1.4.2"
     },
     "require-dev": {
-        "phpunit/phpunit": "4.8.36",
-        "phpspec/prophecy": "1.3.1",
+        "phpunit/phpunit": "~7.0.0",
+        "phpunit/phpunit-mock-objects": "~6.0.0",
+        "phpspec/prophecy": "~1.7",
         "symfony/yaml": "v2.8.9",
         "heroku/heroku-buildpack-php": "v121",
-        "mockery/mockery": "^0.9.9",
-        "jakub-onderka/php-parallel-lint": "^0.9.2",
-        "squizlabs/php_codesniffer": "3.0.0",
+        "mockery/mockery": "~0.9.9",
+        "jakub-onderka/php-parallel-lint": "~0.9.2",
+        "squizlabs/php_codesniffer": "3.3.1",
         "escapestudios/symfony2-coding-standard": "3.x-dev#03f63512cac06e6ccf5694c503121aba978fdd55",
-        "doctrine/instantiator": "1.0.4"
+        "doctrine/instantiator": "1.0.5"
     },
     "autoload": {
         "psr-0": {
@@ -150,6 +151,11 @@
             "name": "Sean Hernandez",
             "homepage": "https://github.com/seanlh",
             "role": "Contributor"
+        },
+        {
+            "name": "Thomas Whitaker",
+            "homepage": "https://github.com/Thomas-Whitaker",
+            "role": "Contributor"
         }
     ]
 }