Переделал пространства имён

met-mw · met-mw · commit 75da1fffc7ac · 2016-06-27T14:13:59.000+03:00
diff --git a/example/hostcms/meta-generator.php b/example/hostcms/meta-generator.php
@@ -2,9 +2,9 @@
 /**
  * Using the library as an example HostCMS
  */
-require_once('../../src/PhpStormMetaGenerator/Interfaces/DriverInterface.php');
-require_once('../../src/PhpStormMetaGenerator/Interfaces/MetaGeneratorInterface.php');
-require_once('../../src/PhpStormMetaGenerator/DriverAbstract.php');
+require_once('../../src/PhpStormMetaGenerator/Drivers/DriverInterface.php');
+require_once('../../src/PhpStormMetaGenerator/MetaGeneratorInterface.php');
+require_once('../../src/PhpStormMetaGenerator/Drivers/DriverAbstract.php');
 require_once('../../src/PhpStormMetaGenerator/MetaGenerator.php');
 require_once('../../src/PhpStormMetaGenerator/Drivers/HostCMS/DriverEntities.php');
 require_once('../../src/PhpStormMetaGenerator/Drivers/HostCMS/DriverAdminEntities.php');
diff --git a/src/PhpStormMetaGenerator/Drivers/DriverAbstract.php b/src/PhpStormMetaGenerator/Drivers/DriverAbstract.php
@@ -1,16 +1,15 @@
 <?php
-namespace PhpStormMetaGenerator;
+namespace PhpStormMetaGenerator\Drivers;
 
 
 use InvalidArgumentException;
-use PhpStormMetaGenerator\Interfaces\DriverInterface;
 
 /**
  * Abstract driver class
  * (Extend this to develop any drivers)
  *
  * Class DriverAbstract
- * @package PhpStormMetaGenerator
+ * @package PhpStormMetaGenerator\Drivers
  */
 abstract class DriverAbstract implements DriverInterface
 {
diff --git a/src/PhpStormMetaGenerator/Drivers/DriverInterface.php b/src/PhpStormMetaGenerator/Drivers/DriverInterface.php
@@ -1,12 +1,12 @@
 <?php
-namespace PhpStormMetaGenerator\Interfaces;
+namespace PhpStormMetaGenerator\Drivers;
 
 
 /**
  * Driver interface
  *
  * Interface DriverInterface
- * @package PhpStormMetaGenerator\Interfaces
+ * @package PhpStormMetaGenerator\Drivers
  */
 interface DriverInterface
 {
diff --git a/src/PhpStormMetaGenerator/Drivers/HostCMS/DriverAdminEntities.php b/src/PhpStormMetaGenerator/Drivers/HostCMS/DriverAdminEntities.php
@@ -2,8 +2,9 @@
 namespace PhpStormMetaGenerator\Drivers\HostCMS;
 
 
-use PhpStormMetaGenerator\DriverAbstract;
-use PhpStormMetaGenerator\Interfaces\DriverInterface;
+use PhpStormMetaGenerator\Drivers\DriverAbstract;
+use PhpStormMetaGenerator\Drivers\DriverInterface;
+
 
 /**
  * Driver for HostCMS to search classes at administrator's area.
diff --git a/src/PhpStormMetaGenerator/Drivers/HostCMS/DriverEntities.php b/src/PhpStormMetaGenerator/Drivers/HostCMS/DriverEntities.php
@@ -3,8 +3,8 @@
 
 
 use InvalidArgumentException;
-use PhpStormMetaGenerator\DriverAbstract;
-use PhpStormMetaGenerator\Interfaces\DriverInterface;
+use PhpStormMetaGenerator\Drivers\DriverAbstract;
+use PhpStormMetaGenerator\Drivers\DriverInterface;
 
 /**
  * Driver for HostCMS to search entities classes.
diff --git a/src/PhpStormMetaGenerator/MetaGenerator.php b/src/PhpStormMetaGenerator/MetaGenerator.php
@@ -3,8 +3,7 @@
 
 
 use InvalidArgumentException;
-use PhpStormMetaGenerator\Interfaces\MetaGeneratorInterface;
-use PhpStormMetaGenerator\Interfaces\DriverInterface;
+use PhpStormMetaGenerator\Drivers\DriverInterface;
 
 /**
  * PhpStorm meta-file generator.
diff --git a/src/PhpStormMetaGenerator/MetaGeneratorInterface.php b/src/PhpStormMetaGenerator/MetaGeneratorInterface.php
@@ -1,12 +1,13 @@
 <?php
-namespace PhpStormMetaGenerator\Interfaces;
+namespace PhpStormMetaGenerator;
+use PhpStormMetaGenerator\Drivers\DriverInterface;
 
 
 /**
  * Meta generator interface
  *
  * Interface MetaGeneratorInterface
- * @package PhpStormMetaGenerator\Interfaces
+ * @package PhpStormMetaGenerator
  */
 interface MetaGeneratorInterface
 {

Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,12 @@`
`1`	`1`	`<?php`
`2`		`-namespace PhpStormMetaGenerator\Interfaces;`
	`2`	`+namespace PhpStormMetaGenerator\Drivers;`
`3`	`3`
`4`	`4`
`5`	`5`	`/**`
`6`	`6`	`* Driver interface`
`7`	`7`	`*`
`8`	`8`	`* Interface DriverInterface`
`9`		`- * @package PhpStormMetaGenerator\Interfaces`
	`9`	`+ * @package PhpStormMetaGenerator\Drivers`
`10`	`10`	`*/`
`11`	`11`	`interface DriverInterface`
`12`	`12`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,13 @@`
`1`	`1`	`<?php`
`2`		`-namespace PhpStormMetaGenerator\Interfaces;`
	`2`	`+namespace PhpStormMetaGenerator;`
	`3`	`+use PhpStormMetaGenerator\Drivers\DriverInterface;`
`3`	`4`
`4`	`5`
`5`	`6`	`/**`
`6`	`7`	`* Meta generator interface`
`7`	`8`	`*`
`8`	`9`	`* Interface MetaGeneratorInterface`
`9`		`- * @package PhpStormMetaGenerator\Interfaces`
	`10`	`+ * @package PhpStormMetaGenerator`
`10`	`11`	`*/`
`11`	`12`	`interface MetaGeneratorInterface`
`12`	`13`	`{`