use custom namespaced packages

pryley · Mar 6, 2019 · fdf3e30 · fdf3e30
1 parent c0392fb
commit fdf3e30
Show file tree

Hide file tree

Showing 33 changed files with 148 additions and 867 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,29 +10,4 @@ coverage.xml
 
 /_
 /node_modules
-/vendor/*/*
-
-!/vendor/qcubed/i18n
-!/vendor/sinergi/browser-detector
-!/vendor/vectorface/whip
-/vendor/*.php
-/vendor/**/.git*
-/vendor/**/Tests
-/vendor/**/tests
-/vendor/**/*.json
-/vendor/**/*.yml
-/vendor/**/CHANGELOG*
-/vendor/**/CONTRIBUTING*
-/vendor/**/Makefile
-/vendor/**/phar-stub.php
-/vendor/**/phpunit.*
-/vendor/**/README*
-/vendor/**/UPGRADING*
-/vendor/composer/installers
-/vendor/qcubed/i18n/src/*.php
-/vendor/qcubed/i18n/test
-/vendor/qcubed/i18n/tools
-/vendor/sinergi/browser-detector/src/AcceptLanguage.php
-/vendor/sinergi/browser-detector/src/Device*
-/vendor/sinergi/browser-detector/src/Language*
-/vendor/sinergi/browser-detector/src/Os*
+/vendor
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
@@ -5,6 +5,7 @@ filter:
     - node_modules/
     - tests/
     - vendor/
+    - vendors/
     - wordpress/
 
 build:

diff --git a/autoload.php b/autoload.php
@@ -8,9 +8,9 @@
 	$namespaces = [
 		'GeminiLabs\\SiteReviews\\' => __DIR__.'/plugin/',
 		'GeminiLabs\\SiteReviews\\Tests\\' => __DIR__.'/tests/',
-		'Sepia\\PoParser\\' => __DIR__.'/vendor/qcubed/i18n/src/Sepia/',
-		'Sinergi\\BrowserDetector\\' => __DIR__.'/vendor/sinergi/browser-detector/src/',
-		'Vectorface\\Whip\\' => __DIR__.'/vendor/vectorface/whip/src/',
+		'GeminiLabs\\Sepia\\PoParser\\' => __DIR__.'/vendors/sepia/po-parser/',
+		'GeminiLabs\\Sinergi\\BrowserDetector\\' => __DIR__.'/vendors/sinergi/browser-detector/',
+		'GeminiLabs\\Vectorface\\Whip\\' => __DIR__.'/vendors/vectorface/whip/',
 	];
 	foreach( $namespaces as $prefix => $baseDir ) {
 		$len = strlen( $prefix );

diff --git a/composer.json b/composer.json
@@ -36,9 +36,6 @@
     "php": ">=5.6"
   },
   "require-dev": {
-    "phpunit/phpunit": "^6.5.13",
-    "qcubed/i18n": "dev-master",
-    "sinergi/browser-detector": "^6.1.2",
-    "vectorface/whip": "^0.3.2"
+    "phpunit/phpunit": "^6.5.13"
   }
 }
diff --git a/composer.lock b/composer.lock
diff --git a/plugin/Helper.php b/plugin/Helper.php
@@ -3,7 +3,7 @@
 namespace GeminiLabs\SiteReviews;
 
 use GeminiLabs\SiteReviews\Database\Cache;
-use Vectorface\Whip\Whip;
+use GeminiLabs\Vectorface\Whip\Whip;
 
 class Helper
 {

diff --git a/plugin/Modules/System.php b/plugin/Modules/System.php
@@ -7,7 +7,7 @@
 use GeminiLabs\SiteReviews\Database\CountsManager;
 use GeminiLabs\SiteReviews\Database\OptionManager;
 use GeminiLabs\SiteReviews\Helper;
-use Sinergi\BrowserDetector\Browser;
+use GeminiLabs\Sinergi\BrowserDetector\Browser;
 
 class System
 {

diff --git a/plugin/Modules/Translation.php b/plugin/Modules/Translation.php
@@ -3,10 +3,10 @@
 namespace GeminiLabs\SiteReviews\Modules;
 
 use Exception;
+use GeminiLabs\Sepia\PoParser\Parser;
 use GeminiLabs\SiteReviews\Application;
 use GeminiLabs\SiteReviews\Database\OptionManager;
 use GeminiLabs\SiteReviews\Modules\Html\Template;
-use Sepia\PoParser\Parser;
 
 class Translation
 {
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,6 +5,7 @@ filter: @@
         - node_modules/
         - tests/
         - vendor/
+        - vendors/
         - wordpress/
     build:
@@ Expand Down @@