Add PhpMyAdmin prefix to namespace

nijel · nijel · commit 5289c4e4394a · 2017-01-23T12:36:46.000+01:00
This way we follow PSR-4. See phpmyadmin/sql-parser#126 Signed-off-by: Michal Čihař <michal@cihar.com>
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,8 @@
 # Change Log
 
-## [Unreleased]
+## [2.0] - 2017-01-23
+
+* Switched to PhpMyAdmin vendor namespace to follow PSR-4.
 
 ## [1.2] - 2017-01-07
 
diff --git a/composer.json b/composer.json
@@ -26,7 +26,7 @@
     },
     "autoload": {
         "psr-4": {
-            "ShapeFile\\": "src"
+            "PhpMyAdmin\\ShapeFile\\": "src"
         }
     }
 }
diff --git a/examples/create_shapefile.php b/examples/create_shapefile.php
@@ -19,8 +19,8 @@
  * along with this program; if not, you can download one from
  * https://www.gnu.org/copyleft/gpl.html.
  */
-use ShapeFile\ShapeFile;
-use ShapeFile\ShapeRecord;
+use PhpMyAdmin\ShapeFile\ShapeFile;
+use PhpMyAdmin\ShapeFile\ShapeRecord;
 
 require_once '../vendor/autoload.php';
 
diff --git a/examples/read.php b/examples/read.php
@@ -19,7 +19,7 @@
  * along with this program; if not, you can download one from
  * https://www.gnu.org/copyleft/gpl.html.
  */
-use ShapeFile\ShapeFile;
+use PhpMyAdmin\ShapeFile\ShapeFile;
 
 /**
  * Displays content of given file.
diff --git a/src/ShapeFile.php b/src/ShapeFile.php
@@ -20,7 +20,7 @@
  * https://www.gnu.org/copyleft/gpl.html.
  */
 
-namespace ShapeFile;
+namespace PhpMyAdmin\ShapeFile;
 
 /**
  * ShapeFile class.
diff --git a/src/ShapeRecord.php b/src/ShapeRecord.php
@@ -20,7 +20,7 @@
  * https://www.gnu.org/copyleft/gpl.html.
  */
 
-namespace ShapeFile;
+namespace PhpMyAdmin\ShapeFile;
 
 /**
  * ShapeFile record class.
diff --git a/src/Util.php b/src/Util.php
@@ -20,7 +20,7 @@
  * https://www.gnu.org/copyleft/gpl.html.
  */
 
-namespace ShapeFile;
+namespace PhpMyAdmin\ShapeFile;
 
 class Util
 {
diff --git a/tests/ShapeFileTest.php b/tests/ShapeFileTest.php
@@ -22,8 +22,8 @@
 
 namespace ShapeFileTest;
 
-use ShapeFile\ShapeFile;
-use ShapeFile\ShapeRecord;
+use PhpMyAdmin\ShapeFile\ShapeFile;
+use PhpMyAdmin\ShapeFile\ShapeRecord;
 
 class ShapeFileTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/UtilTest.php b/tests/UtilTest.php
@@ -21,7 +21,7 @@
 
 namespace UtilTest;
 
-use ShapeFile\Util;
+use PhpMyAdmin\ShapeFile\Util;
 
 class UtilTest extends \PHPUnit_Framework_TestCase
 {

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`},`
`27`	`27`	`"autoload": {`
`28`	`28`	`"psr-4": {`
`29`		`- "ShapeFile\\": "src"`
	`29`	`+ "PhpMyAdmin\\ShapeFile\\": "src"`
`30`	`30`	`}`
`31`	`31`	`}`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`* https://www.gnu.org/copyleft/gpl.html.`
`21`	`21`	`*/`
`22`	`22`
`23`		`-namespace ShapeFile;`
	`23`	`+namespace PhpMyAdmin\ShapeFile;`
`24`	`24`
`25`	`25`	`class Util`
`26`	`26`	`{`
Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,8 @@`
`22`	`22`
`23`	`23`	`namespace ShapeFileTest;`
`24`	`24`
`25`		`-use ShapeFile\ShapeFile;`
`26`		`-use ShapeFile\ShapeRecord;`
	`25`	`+use PhpMyAdmin\ShapeFile\ShapeFile;`
	`26`	`+use PhpMyAdmin\ShapeFile\ShapeRecord;`
`27`	`27`
`28`	`28`	`class ShapeFileTest extends \PHPUnit_Framework_TestCase`
`29`	`29`	`{`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`
`22`	`22`	`namespace UtilTest;`
`23`	`23`
`24`		`-use ShapeFile\Util;`
	`24`	`+use PhpMyAdmin\ShapeFile\Util;`
`25`	`25`
`26`	`26`	`class UtilTest extends \PHPUnit_Framework_TestCase`
`27`	`27`	`{`