Exception Handling improved; syntax fixes, some dependencies updated. (…

…directus#829) * JSON syntax fixed. * composer dev dependencies updated. * one missed PDOException being caught & handled. * IfModule updated; checking for mod_fastcgi & mod_proxy_fcgi. * check for mod_fastcgi removed. * minor: syntax fixed. * vuepress updated (automatically). * phpunit 7.x actually is required. * ignore added. * ignore added.
softdzx · Mar 18, 2019 · bfd8d4d · bfd8d4d
1 parent be18300
commit bfd8d4d
Show file tree

Hide file tree

Showing 9 changed files with 35 additions and 10 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,6 +8,7 @@ Icon
 node_modules
 yarn.lock
 package-lock.json
+/nbproject/
 
 # Don't track composer phar/vendors
 composer.phar
@@ -54,3 +55,4 @@ composer.lock
 # Keep gitkeep files
 # This will make sure empty directories has at least one file so it can be tracked by git
 !**/.gitkeep
+/docs/
diff --git a/composer.json b/composer.json
@@ -41,7 +41,11 @@
     "ext-gd": "*"
   },
   "require-dev": {
-    "phpunit/phpunit": "^5.7.25"
+    "phpunit/phpunit": "^7.0.0",
+    "phpunit/php-code-coverage": "^6.1.4",
+    "phpunit/php-token-stream": "^3.0.0",
+    "phpunit/php-invoker": "^2.0.0",
+    "ext-tokenizer": "*"
   },
   "suggest": {
     "paragonie/random_compat": "Generates cryptographically more secure pseudo-random bytes",

diff --git a/config/api_sample.php b/config/api_sample.php
@@ -3,7 +3,7 @@
 return [
     'app' => [
         'env' => 'production',
-        'timezone' => 'America/New_York',
+        'timezone' => 'America/New_York'
     ],
 
     'settings' => [

diff --git a/package.json b/package.json
@@ -20,6 +20,6 @@
   },
   "homepage": "https://github.com/directus/api#readme",
   "devDependencies": {
-    "vuepress": "^0.7.1"
+    "vuepress": "^0.14.10"
   }
 }
diff --git a/public/.htaccess b/public/.htaccess
@@ -1,14 +1,19 @@
-# Comment this line if you are getting: "Option SymLinksIfOwnerMatch not allowed here" error
-# in Apache
+# Comment this line if you are getting: "Option SymLinksIfOwnerMatch not allowed here" error in Apache
 Options +SymLinksIfOwnerMatch
 
 php_value upload_max_filesize 50M
 php_value post_max_size 100M
 
+# php5_module automatically handles HTTP_AUTHORIZATION headers, but fcgi_module does not.
+<IfModule mod_setenvif.c>
+    <IfModule mod_proxy_fcgi.c>
+        SetEnvIfNoCase ^Authorization$ "(.+)" HTTP_AUTHORIZATION=$1
+    </IfModule>
+</IfModule>
+
 <ifModule mod_rewrite.c>
-    RewriteEngine On
 
-    RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
+    RewriteEngine On
 
     # Map all admin endpoints to the admin app (except static files)
     RewriteCond %{REQUEST_FILENAME} !-f
@@ -17,4 +22,5 @@ php_value post_max_size 100M
     # Map all other requests to invoke the API router (except static files)
     RewriteCond %{REQUEST_FILENAME} !-f
     RewriteRule !^admin index.php?%{QUERY_STRING} [L]
+
 </ifModule>
diff --git a/src/core/Directus/Console/Cli.php b/src/core/Directus/Console/Cli.php
@@ -90,9 +90,22 @@ private function cmd()
             echo PHP_EOL . PHP_EOL . 'Module ' . $module . ' error: ' . $e->getMessage() . PHP_EOL . PHP_EOL;
         } catch (UnsupportedCommandException $e) {
             echo PHP_EOL . PHP_EOL . 'Module ' . $module . ' error: ' . $e->getMessage() . PHP_EOL . PHP_EOL;
+        } catch(\PDOException $e) {
+            $this->handlePdoException($e);
         }
     }
 
+    private function handlePdoException(\PDOException $e) {
+        $expected = "Duplicate entry 'directus_activity-id' for key 'idx_collection_field'";
+        if((int) $e->errorInfo[0] == 23000 && $e->errorInfo[2] == $expected) {
+            echo "The Database for ".$this->directusPath." had already been deployed.\n";
+            echo "You may use option -f to enforce the overwriting of existing data.";
+        } else {
+            throw($e);
+        }
+        exit(1);
+    }
+
     private function showHelp()
     {
         echo PHP_EOL . 'Directus CLI Modules: ' . PHP_EOL . PHP_EOL;

diff --git a/src/core/Directus/Exception/composer.json b/src/core/Directus/Exception/composer.json
@@ -7,7 +7,7 @@
   ],
   "license": "GPL-3.0-only",
   "require": {
-    "php": "^7.1",
+    "php": "^7.1"
   },
   "autoload": {
     "psr-4": {

diff --git a/src/core/Directus/Hook/composer.json b/src/core/Directus/Hook/composer.json
@@ -8,7 +8,7 @@
   ],
   "license": "GPL-3.0-only",
   "require": {
-    "php": "^7.1",
+    "php": "^7.1"
   },
   "autoload": {
     "psr-4": {

diff --git a/src/core/Directus/Util/composer.json b/src/core/Directus/Util/composer.json
@@ -8,7 +8,7 @@
   ],
   "license": "GPL-3.0-only",
   "require": {
-    "php": "^7.1",
+    "php": "^7.1"
   },
   "autoload": {
     "psr-4": {