Sorted + Updated Dependencies, minor refactoring (#928)

ubccr · May 15, 2019 · be2414b · be2414b
1 parent efc115f
commit be2414b
Show file tree

Hide file tree

Showing 4 changed files with 621 additions and 489 deletions.
diff --git a/classes/ETL/DataEndpoint/JsonFile.php b/classes/ETL/DataEndpoint/JsonFile.php
@@ -136,7 +136,7 @@ protected function verifyData()
 
         foreach ($this->recordList as $index => $record) {
             $recordCount++;
-            $validator->check($record, $schemaObject);
+            $validator->validate($record, $schemaObject);
 
             if ( $validator->isValid() ) {
                 continue;

diff --git a/composer.json b/composer.json
@@ -1,38 +1,38 @@
 {
     "require": {
-        "silex/silex": "~1.2",
-        "greenlion/php-sql-parser": "~4.1.0",
-        "simplesamlphp/simplesamlphp": "~1.15.4",
-        "robrichards/xmlseclibs": "~3.0.1",
-        "justinrainbow/json-schema": "~2.0",
-        "symfony/process": "~2.0",
-        "sencha/extjs-gpl": "3.4.*",
-        "highsoft/highcharts": "^4.2.5",
-        "moment/moment-min-file": "^2.13.0",
-        "moment/moment-timezone-min-file": "^0.5.4",
-        "jquery/jquery-min-file": "^1.12.4",
-        "carlo/jquery-base64-file": "^1.0",
-        "tildeio/rsvpjs-min-file": "^3.0.18",
-        "jaspersoft/jasperreports-library-jar": "^3.7.6",
-        "apache/xalan-j-2jars": "^2.7.1",
-        "apache/poi": "^3.6",
-        "itextpdf/itextpdf": "^2.1.7",
         "apache/commons-beanutils": "^1.8.0",
         "apache/commons-collections": "^2.1.1",
         "apache/commons-digester": "^1.7",
         "apache/commons-logging": "^1.0.4",
+        "apache/poi": "^3.6",
+        "apache/xalan-j-2jars": "^2.7.1",
+        "carlo/jquery-base64-file": "^1.0",
         "egulias/email-validator": "^1.2",
-        "taq/pdooci": "^1.0",
+        "google/recaptcha": "~1.1",
+        "greenlion/php-sql-parser": "~4.2",
+        "highsoft/highcharts": "^4.2.5",
+        "ircmaxell/password-compat": "~1",
+        "itextpdf/itextpdf": "^2.1.7",
+        "jaspersoft/jasperreports-library-jar": "^3.7.6",
+        "jquery/jquery-min-file": "^1.12.4",
+        "justinrainbow/json-schema": "~5.2",
+        "moment/moment-min-file": "^2.13.0",
+        "moment/moment-timezone-min-file": "^0.5.4",
+        "paragonie/random_compat": "~2.0",
         "phpmailer/phpmailer": "^5.2",
-        "ubccr/simplesamlphp-module-authglobus": "^1.3",
+        "robrichards/xmlseclibs": "~3.0",
+        "sencha/extjs-gpl": "3.4.*",
+        "silex/silex": "~1.2",
+        "simplesamlphp/simplesamlphp": "~1",
+        "symfony/polyfill-php56": "~1.11",
+        "symfony/process": "~2.0",
+        "taq/pdooci": "^1.0",
+        "tildeio/rsvpjs-min-file": "^3.0.18",
         "ubccr/log": "1.13.2",
-        "google/recaptcha": "~1.1",
-        "ircmaxell/password-compat": "^1.0",
-        "symfony/polyfill-php56": "^1.9",
-        "paragonie/random_compat": "^2.0"
+        "ubccr/simplesamlphp-module-authglobus": "^1.3"
     },
     "require-dev": {
-        "phpunit/phpunit": "4.8.*"
+        "phpunit/phpunit": "~4.8"
     },
     "repositories": [
         {