Changed namespaces to Mecha vendor

mecha · mecha · commit cdf8a6e2523f · 2020-02-12T11:09:33.000+01:00
diff --git a/composer.json b/composer.json
@@ -23,14 +23,14 @@
     },
     "autoload": {
         "psr-4": {
-            "Dhii\\Modular\\Module\\": "src"
+            "Mecha\\Modular\\": "src"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "Dhii\\Modular\\Module\\UnitTest\\": "test/unit",
-            "Dhii\\Modular\\Module\\FuncTest\\": "test/functional",
-            "Dhii\\Modular\\Module\\Test\\": "test/stubs"
+            "Mecha\\Modular\\UnitTest\\": "test/unit",
+            "Mecha\\Modular\\FuncTest\\": "test/functional",
+            "Mecha\\Modular\\Test\\": "test/stubs"
         }
     },
     "scripts": {
diff --git a/src/ExtensionInterface.php b/src/ExtensionInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Dhii\Modular\Module;
+namespace Mecha\Modular;
 
 use Psr\Container\ContainerInterface;
 
diff --git a/src/FactoryInterface.php b/src/FactoryInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Dhii\Modular\Module;
+namespace Mecha\Modular;
 
 use Psr\Container\ContainerInterface;
 
diff --git a/src/ModularInterface.php b/src/ModularInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Dhii\Modular\Module;
+namespace Mecha\Modular;
 
 /**
  * Interface for something that is modular and can provide its list of modules.
diff --git a/src/ModuleInterface.php b/src/ModuleInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Dhii\Modular\Module;
+namespace Mecha\Modular;
 
 use Psr\Container\ContainerInterface;
 
diff --git a/src/Modules/ModularModule.php b/src/Modules/ModularModule.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Dhii\Modular\Module\Modules;
+namespace Mecha\Modular\Modules;
 
-use Dhii\Modular\Module\ExtensionInterface;
-use Dhii\Modular\Module\FactoryInterface;
-use Dhii\Modular\Module\ModularInterface;
-use Dhii\Modular\Module\ModuleInterface;
+use Mecha\Modular\ExtensionInterface;
+use Mecha\Modular\FactoryInterface;
+use Mecha\Modular\ModularInterface;
+use Mecha\Modular\ModuleInterface;
 use Psr\Container\ContainerInterface;
 
 /**
diff --git a/src/Modules/PrefixingModule.php b/src/Modules/PrefixingModule.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Dhii\Modular\Module\Modules;
+namespace Mecha\Modular\Modules;
 
 use Dhii\Container\DeprefixingContainer;
-use Dhii\Modular\Module\ModuleInterface;
-use Dhii\Modular\Module\ServiceInterface;
+use Mecha\Modular\ModuleInterface;
+use Mecha\Modular\ServiceInterface;
 use Psr\Container\ContainerInterface;
 
 /**
diff --git a/src/ServiceInterface.php b/src/ServiceInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Dhii\Modular\Module;
+namespace Mecha\Modular;
 
 /**
  * Represents a service that is provided by a module.
diff --git a/src/Services/AbstractService.php b/src/Services/AbstractService.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Dhii\Modular\Module\Services;
+namespace Mecha\Modular\Services;
 
-use Dhii\Modular\Module\ServiceInterface;
+use Mecha\Modular\ServiceInterface;
 use Psr\Container\ContainerInterface;
 
 /**
diff --git a/src/Services/Alias.php b/src/Services/Alias.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Dhii\Modular\Module\Services;
+namespace Mecha\Modular\Services;
 
-use Dhii\Modular\Module\FactoryInterface;
+use Mecha\Modular\FactoryInterface;
 use Psr\Container\ContainerInterface;
 
 /**
diff --git a/src/Services/ArrayExtension.php b/src/Services/ArrayExtension.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Dhii\Modular\Module\Services;
+namespace Mecha\Modular\Services;
 
-use Dhii\Modular\Module\ExtensionInterface;
+use Mecha\Modular\ExtensionInterface;
 use Psr\Container\ContainerInterface;
 
 /**
diff --git a/src/Services/Extension.php b/src/Services/Extension.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Dhii\Modular\Module\Services;
+namespace Mecha\Modular\Services;
 
-use Dhii\Modular\Module\ExtensionInterface;
+use Mecha\Modular\ExtensionInterface;
 use Psr\Container\ContainerInterface;
 
 class Extension extends AbstractService implements ExtensionInterface
diff --git a/src/Services/Factory.php b/src/Services/Factory.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Dhii\Modular\Module\Services;
+namespace Mecha\Modular\Services;
 
-use Dhii\Modular\Module\FactoryInterface;
+use Mecha\Modular\FactoryInterface;
 use Psr\Container\ContainerInterface;
 
 /**
diff --git a/src/Services/FormatStr.php b/src/Services/FormatStr.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Dhii\Modular\Module\Services;
+namespace Mecha\Modular\Services;
 
-use Dhii\Modular\Module\FactoryInterface;
+use Mecha\Modular\FactoryInterface;
 use Psr\Container\ContainerInterface;
 
 /**
diff --git a/src/Services/Func.php b/src/Services/Func.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Dhii\Modular\Module\Services;
+namespace Mecha\Modular\Services;
 
-use Dhii\Modular\Module\FactoryInterface;
+use Mecha\Modular\FactoryInterface;
 use Psr\Container\ContainerInterface;
 
 /**
diff --git a/src/Services/GlobalVar.php b/src/Services/GlobalVar.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Dhii\Modular\Module\Services;
+namespace Mecha\Modular\Services;
 
-use Dhii\Modular\Module\FactoryInterface;
+use Mecha\Modular\FactoryInterface;
 use Psr\Container\ContainerInterface;
 
 /**
diff --git a/src/Services/Value.php b/src/Services/Value.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Dhii\Modular\Module\Services;
+namespace Mecha\Modular\Services;
 
-use Dhii\Modular\Module\FactoryInterface;
+use Mecha\Modular\FactoryInterface;
 use Psr\Container\ContainerInterface;
 
 /**
diff --git a/src/Util/ModuleServiceProvider.php b/src/Util/ModuleServiceProvider.php
@@ -0,0 +1,60 @@
+<?php
+
+namespace Mecha\Modular\Util;
+
+use Mecha\Modular\ModuleInterface;
+use Interop\Container\ServiceProviderInterface;
+
+/**
+ * A service provider adapter for modules.
+ *
+ * This class may be used to adapt modules into service providers, which could be useful when using containers that
+ * work with service providers.
+ *
+ * Example usage:
+ *  ```
+ *  $module = new MyModule();
+ *  $provider = new ModuleServiceProvider($module);
+ *
+ *  $container = new SpContainer([$provider]);
+ *  ```
+ *
+ * @since [*next-version*]
+ */
+class ModuleServiceProvider implements ServiceProviderInterface
+{
+    /**
+     * @since [*next-version*]
+     *
+     * @var ModuleInterface
+     */
+    protected $module;
+
+    /**
+     * Constructor.
+     *
+     * @since [*next-version*]
+     *
+     * @param ModuleInterface $module
+     */
+    public function __construct(ModuleInterface $module)
+    {
+        $this->module = $module;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getFactories()
+    {
+        return $this->module->getFactories();
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getExtensions()
+    {
+        return $this->module->getExtensions();
+    }
+}
diff --git a/test/stubs/CallbackInterface.php b/test/stubs/CallbackInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Dhii\Modular\Module\Test;
+namespace Mecha\Modular\Test;
 
 /**
  * Interface used for creating mock callbacks. Useful for setting expectations on callbacks.
diff --git a/test/unit/ExtensionInterfaceTest.php b/test/unit/ExtensionInterfaceTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Dhii\Modular\UnitTest\Module;
+namespace Mecha\Modular\UnitTest;
 
-use Dhii\Modular\Module\ExtensionInterface as TestSubject;
-use Dhii\Modular\Module\ServiceInterface;
+use Mecha\Modular\ExtensionInterface as TestSubject;
+use Mecha\Modular\ServiceInterface;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
diff --git a/test/unit/FactoryInterfaceTest.php b/test/unit/FactoryInterfaceTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Dhii\Modular\UnitTest\Module;
+namespace Mecha\Modular\UnitTest;
 
-use Dhii\Modular\Module\FactoryInterface as TestSubject;
-use Dhii\Modular\Module\ServiceInterface;
+use Mecha\Modular\FactoryInterface as TestSubject;
+use Mecha\Modular\ServiceInterface;
 use PHPUnit\Framework\TestCase;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
diff --git a/test/unit/Modules/ModularModuleTest.php b/test/unit/Modules/ModularModuleTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Dhii\Modular\Module\UnitTest\Module;
+namespace Mecha\Modular\UnitTest\Modules;
 
-use Dhii\Modular\Module\ModularInterface;
-use Dhii\Modular\Module\ModuleInterface;
-use Dhii\Modular\Module\Modules\ModularModule as TestSubject;
+use Mecha\Modular\ModularInterface;
+use Mecha\Modular\ModuleInterface;
+use Mecha\Modular\Modules\ModularModule as TestSubject;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Psr\Container\ContainerInterface;
diff --git a/test/unit/Modules/PrefixingModuleTest.php b/test/unit/Modules/PrefixingModuleTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Dhii\Modular\Module\UnitTest\Module;
+namespace Mecha\Modular\UnitTest\Modules;
 
-use Dhii\Modular\Module\ExtensionInterface;
-use Dhii\Modular\Module\FactoryInterface;
-use Dhii\Modular\Module\ModuleInterface;
-use Dhii\Modular\Module\Modules\PrefixingModule as TestSubject;
+use Mecha\Modular\ExtensionInterface;
+use Mecha\Modular\FactoryInterface;
+use Mecha\Modular\ModuleInterface;
+use Mecha\Modular\Modules\PrefixingModule as TestSubject;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Psr\Container\ContainerInterface;
diff --git a/test/unit/Services/AbstractServiceTest.php b/test/unit/Services/AbstractServiceTest.php
@@ -1,10 +1,9 @@
 <?php
 
-namespace Dhii\Modular\Module\UnitTest\Services;
+namespace Mecha\Modular\UnitTest\Services;
 
-use Dhii\Modular\Module\Services\AbstractService as TestSubject;
-use Dhii\Modular\Module\FactoryInterface;
-use Dhii\Modular\Module\ServiceInterface;
+use Mecha\Modular\ServiceInterface;
+use Mecha\Modular\Services\AbstractService as TestSubject;
 use PHPUnit\Framework\TestCase;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
diff --git a/test/unit/Services/AliasTest.php b/test/unit/Services/AliasTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Dhii\Modular\Module\UnitTest\Services;
+namespace Mecha\Modular\UnitTest\Services;
 
-use Dhii\Modular\Module\Services\Alias as TestSubject;
-use Dhii\Modular\Module\FactoryInterface;
-use Dhii\Modular\Module\Test\CallbackInterface;
+use Mecha\Modular\Services\Alias as TestSubject;
+use Mecha\Modular\FactoryInterface;
+use Mecha\Modular\Test\CallbackInterface;
 use PHPUnit\Framework\TestCase;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
 use Psr\Container\ContainerInterface;
diff --git a/test/unit/Services/ArrayExtensionTest.php b/test/unit/Services/ArrayExtensionTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Dhii\Modular\Module\UnitTest\Services;
+namespace Mecha\Modular\UnitTest\Services;
 
-use Dhii\Modular\Module\ExtensionInterface;
-use Dhii\Modular\Module\Services\ArrayExtension as TestSubject;
+use Mecha\Modular\ExtensionInterface;
+use Mecha\Modular\Services\ArrayExtension as TestSubject;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Psr\Container\ContainerInterface;
diff --git a/test/unit/Services/ExtensionTest.php b/test/unit/Services/ExtensionTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Dhii\Modular\Module\UnitTest\Services;
+namespace Mecha\Modular\UnitTest\Services;
 
-use Dhii\Modular\Module\ExtensionInterface;
-use Dhii\Modular\Module\Services\Extension as TestSubject;
-use Dhii\Modular\Module\Test\CallbackInterface;
+use Mecha\Modular\ExtensionInterface;
+use Mecha\Modular\Services\Extension as TestSubject;
+use Mecha\Modular\Test\CallbackInterface;
 use PHPUnit\Framework\TestCase;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
 use Psr\Container\ContainerInterface;
diff --git a/test/unit/Services/FactoryTest.php b/test/unit/Services/FactoryTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Dhii\Modular\Module\UnitTest\Services;
+namespace Mecha\Modular\UnitTest\Services;
 
-use Dhii\Modular\Module\Services\Factory as TestSubject;
-use Dhii\Modular\Module\FactoryInterface;
-use Dhii\Modular\Module\Test\CallbackInterface;
+use Mecha\Modular\Services\Factory as TestSubject;
+use Mecha\Modular\FactoryInterface;
+use Mecha\Modular\Test\CallbackInterface;
 use PHPUnit\Framework\TestCase;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
 use Psr\Container\ContainerInterface;
diff --git a/test/unit/Services/FormatStrTest.php b/test/unit/Services/FormatStrTest.php
diff --git a/test/unit/Services/FuncTest.php b/test/unit/Services/FuncTest.php
diff --git a/test/unit/Services/GlobalVarTest.php b/test/unit/Services/GlobalVarTest.php
diff --git a/test/unit/Services/ValueTest.php b/test/unit/Services/ValueTest.php
