Bug SAFeSEA#34/SAFeSEA#35, fixed respect/validation PHP dependency …

…[iet:10301360]

* Minor re-format of Travis-CI YAML; README edits; Apache conf [iet:10302190]

.gitignore

@@ -17,6 +17,7 @@ extras/documentation
 *.sql.zip
 composer.phar
 
+.gitattributes
 .editorconfig
 node_modules/
 package-lock.json

.travis.yml

@@ -6,9 +6,7 @@ php: 7.0
 git:
   depth: 5
 
-before_install:
-  - nvm install v8.1
-  - npm -v
+before_install: nvm install v8.1
 
 install:
   - composer prepare
@@ -24,6 +22,6 @@ after_script:
   - composer validate
   - ls -alh
   - ls -alh public_html/assets/
-  - git status
+  #- git status
 
 # End.

README.md

@@ -8,7 +8,7 @@ Web frontend to the essay analyser and summariser — [pyEssayAnalyser][py].
 
 Part of the [SafeSEA][] project.
 (Grants: _[Open University][ou-grant], [Oxford University][ox-grant]_.)
-(_Research [papers on ORO][oro-ss]._)
+(_Research [papers on ORO][oro-ss]. [YouTube demo][yt-demo]_)
 
 Built on [Slim PHP framework][slim].
 
@@ -45,7 +45,7 @@ composer test
 
 ## Database
 
-To create and seed the MySQL database [tables][db], start typing:
+To create and seed the [MySQL database tables][db], start typing:
 
 ```sh
 composer cli-help
@@ -91,6 +91,8 @@ app/cli.php --create-tables
 
 [safesea]: http://www.open.ac.uk/researchprojects/safesea/
   "Supportive Automated Feedback for Short Essay Answers (SAFeSEA)."
+[yt-demo]: https://youtu.be/7a3ATQPjpiM# "openEssayist Software Tool Demonstration, @ietou on YouTube"
+[yt-intro]: https://youtu.be/a9l0ts1tgK4# "Introduction to openEssayist - Professor Denise Whitelock, @ietou on YouTube"
 [oro-ss]: http://oro.open.ac.uk/cgi/search/archive/advanced?project_details_project_name=SafeSEA "'SafeSEA' on ORO (10 results)"
 [oro-oe]: http://oro.open.ac.uk/cgi/search/archive/simple?meta=OpenEssayist& "'OpenEssayist' on ORO (8 results)"
 [ou-grant]: http://gow.epsrc.ac.uk/NGBOViewGrant.aspx?GrantRef=EP/J005959/1

app/_data/openessayist.open.ac.uk-apache.conf

@@ -14,6 +14,7 @@
 # Legacy:    SetHandler application/x-httpd-php
 </FilesMatch>
 
+ServerTokens    Prod
 NameVirtualHost *:80
 
 <VirtualHost *:80>

app/controllers/login.controller.php

@@ -1,11 +1,12 @@
 <?php
 /**
- * OpenEssayist-slim.
+ * Login controller.
  *
+ * @package   OpenEssayist-slim
  * @copyright © 2013-2018 The Open University. (Institute of Educational Technology)
  */
 
-use Respect\Validation\Validator as v;
+use Respect\Validation\Validator; // as v;
 use IET_OU\SamsCAuth\SamsCAuth;
 
 /**
@@ -98,15 +99,15 @@ public function index()
 
 		/*if ($this->app->request()->isPost()) {
 			try {
-				$usernameValidator = v::alnum()
+				$usernameValidator = Validator::alnum()
 				->noWhitespace()
 				->notEmpty();
 				//->length(4,22);
 
 				$usernameValidator->check($this->post('username'));
 
 				try {
-					v::alnum()
+					Validator::alnum()
 					->notEmpty()
 					//->length(3,11)
 					->check($this->post('password'));
@@ -281,7 +282,7 @@ protected static function getCurrentUrl()
 	}
 
   /**
-	 * Record each time a user sign in.
+	 * Record each time a user signs in.
 	 * @param object|int $user_id  User model object, or user ID.
 	 */
 	protected function recordVisit($user_id)

composer.json

@@ -1,12 +1,12 @@
 {
     "name": "iet-ou/openessayist-slim",
     "description": "Web frontend to the essay analyser & summariser (pyEssayAnalyser). SafeSEA project. © 2013-2018 The Open University (IET). All rights reserved.",
-    "keywords": [ "SafeSEA", "EPSRC", "IET-OU", "OpenUniversity" ],
+    "keywords": [ "SafeSEA", "essay-analyser", "EPSRC", "IET-OU", "OpenUniversity" ],
     "homepage": "http://www.open.ac.uk/researchprojects/safesea/",
     "time": "2013-02-08",
     "license": "proprietary",
     "support": {
-        "source": "https://github.com/SAFeSEA/openEssayist-slim",
+        "source": "https://github.com/SAFeSEA/openEssayist-slim.git",
         "email": "[email protected]"
     },
     "authors": [
@@ -19,7 +19,7 @@
     "minimum-stability": "dev",
     "autoload": { },
     "repositories": [
-      { "type": "composer", "url": "https://embed.open.ac.uk/iet-satis/" }
+        { "type": "composer", "url": "https://embed.open.ac.uk/iet-satis/" }
     ],
     "require": {
         "php": ">=5.5.9",
@@ -29,7 +29,7 @@
         "twig/twig": "1.35.*",
         "j4mie/paris": "^1.5.6",
         "j4mie/idiorm": "^1.5.5",
-        "respect/validation": "dev-develop",
+        "respect/validation": "^1.1.15",
         "rmccue/requests": "^1.7.0",
         "nfreear/composer-suggest": "^1.2"
     },
@@ -41,11 +41,12 @@
         "ext-zip": "*",
         "ext-mycrypt": "*",
         "iet-ou/sams-c-auth": "1.0.*-dev; ou-sams",
+        "respect/validation": "dev-develop#06224c04369e",
         "slim/extras": "dev-develop#5bceb36"
     },
     "scripts": {
         "cli-help": "app/cli.php --help",
-        "redhat-install": "yum install php php-mcrypt php-zip patch httpd mod_fcgid # No -y",
+        "redhat-install": "yum install php php-mcrypt php-zip patch nodejs httpd mod_fcgid # No -y",
         "redhat-check": "yum install php* 2>/dev/null | grep 'already installed'",
         "npm-install": "npm i",
         "prepare": [
@@ -58,7 +59,8 @@
         "chown": [ "chown -R nginx:nginx ./.cache", "chown -R nginx:nginx ./.logs" ],
         "symlink-data":  [ "cd public_html; ln -s ../_user_data/images user-images" ],
         "_X_NO_patch": "patch -ub --verbose vendor/slim/extras/Slim/Extras/Views/Twig.php app/_data/vendor-slim-extras-Views-Twig-php--render-function.diff",
-        "copy-nginx": "cp -n app/_data/openessayist.open.ac.uk-nginx.conf /etc/nginx/sites-available/openessayist.open.ac.uk",
+        "copy-apache": "cp -n app/_data/openessayist.open.ac.uk-apache.conf /etc/httpd/conf.d/openessayist.open.ac.uk",
+        "copy-nginx": "cp -n app/_data/openessayist.open.ac.uk-nginx.conf /etc/nginx/sites-available/openessayist.open.ac.uk # Legacy.",
         "copy-conf": "cp -n app/config.DIST.php app/config.php",
         "copy-dotenv": "cp -n .env.DIST .env",
         "_X_pip-install": "pip install git+https://github.com/google/mysql-tools.git@02d1854273#egg=mysql-tools",