facile-it
diff --git a/‎composer.json
+15-12 b/‎composer.json
+15-12
diff --git a/‎phpunit.xml.dist
+4-4 b/‎phpunit.xml.dist
+4-4
diff --git a/‎src/Moka/Builder/ProxyBuilder.php ‎src/Builder/ProxyBuilder.php b/‎src/Moka/Builder/ProxyBuilder.php ‎src/Builder/ProxyBuilder.php
diff --git a/‎src/Moka/Exception/InvalidArgumentException.php ‎src/Exception/InvalidArgumentException.php b/‎src/Moka/Exception/InvalidArgumentException.php ‎src/Exception/InvalidArgumentException.php
diff --git a/‎src/Moka/Exception/InvalidIdentifierException.php ‎src/Exception/InvalidIdentifierException.php b/‎src/Moka/Exception/InvalidIdentifierException.php ‎src/Exception/InvalidIdentifierException.php
diff --git a/‎src/Moka/Exception/MissingDependencyException.php ‎src/Exception/MissingDependencyException.php b/‎src/Moka/Exception/MissingDependencyException.php ‎src/Exception/MissingDependencyException.php
diff --git a/‎src/Moka/Exception/MockNotCreatedException.php ‎src/Exception/MockNotCreatedException.php b/‎src/Moka/Exception/MockNotCreatedException.php ‎src/Exception/MockNotCreatedException.php
diff --git a/‎src/Moka/Exception/NotImplementedException.php ‎src/Exception/NotImplementedException.php b/‎src/Moka/Exception/NotImplementedException.php ‎src/Exception/NotImplementedException.php
diff --git a/‎src/Moka/Factory/ProxyBuilderFactory.php ‎src/Factory/ProxyBuilderFactory.php b/‎src/Moka/Factory/ProxyBuilderFactory.php ‎src/Factory/ProxyBuilderFactory.php
diff --git a/‎src/Moka/Factory/ProxyGeneratorFactory.php ‎src/Factory/ProxyGeneratorFactory.php b/‎src/Moka/Factory/ProxyGeneratorFactory.php ‎src/Factory/ProxyGeneratorFactory.php
diff --git a/‎src/Moka/Factory/StubFactory.php ‎src/Factory/StubFactory.php b/‎src/Moka/Factory/StubFactory.php ‎src/Factory/StubFactory.php
diff --git a/‎src/Moka/Generator/ProxyGenerator.php ‎src/Generator/ProxyGenerator.php b/‎src/Moka/Generator/ProxyGenerator.php ‎src/Generator/ProxyGenerator.php
diff --git a/‎src/Moka/Generator/Template/ClassTemplate.php ‎src/Generator/Template/ClassTemplate.php b/‎src/Moka/Generator/Template/ClassTemplate.php ‎src/Generator/Template/ClassTemplate.php
diff --git a/‎src/Moka/Generator/Template/MethodTemplate.php ‎src/Generator/Template/MethodTemplate.php b/‎src/Moka/Generator/Template/MethodTemplate.php ‎src/Generator/Template/MethodTemplate.php
diff --git a/‎src/Moka/Generator/Template/ParameterTemplate.php ‎src/Generator/Template/ParameterTemplate.php b/‎src/Moka/Generator/Template/ParameterTemplate.php ‎src/Generator/Template/ParameterTemplate.php
diff --git a/‎src/Moka/Generator/Template/PropertyInitializationTemplate.php ‎src/Generator/Template/PropertyInitializationTemplate.php b/‎src/Moka/Generator/Template/PropertyInitializationTemplate.php ‎src/Generator/Template/PropertyInitializationTemplate.php
diff --git a/‎src/Moka/Generator/Template/PropertyTemplate.php ‎src/Generator/Template/PropertyTemplate.php b/‎src/Moka/Generator/Template/PropertyTemplate.php ‎src/Generator/Template/PropertyTemplate.php
diff --git a/‎src/Moka/Generator/Template/ReturnTypeTemplate.php ‎src/Generator/Template/ReturnTypeTemplate.php b/‎src/Moka/Generator/Template/ReturnTypeTemplate.php ‎src/Generator/Template/ReturnTypeTemplate.php
diff --git a/‎src/Moka/Generator/Template/TemplateInterface.php ‎src/Generator/Template/TemplateInterface.php b/‎src/Moka/Generator/Template/TemplateInterface.php ‎src/Generator/Template/TemplateInterface.php
diff --git a/‎src/Moka/Generator/Template/VisibilityTrait.php ‎src/Generator/Template/VisibilityTrait.php b/‎src/Moka/Generator/Template/VisibilityTrait.php ‎src/Generator/Template/VisibilityTrait.php
diff --git a/‎src/Moka/Moka.php ‎src/Moka.php b/‎src/Moka/Moka.php ‎src/Moka.php
diff --git a/‎src/Moka/Plugin/Mockery/MockeryMockingStrategy.php ‎src/Plugin/Mockery/MockeryMockingStrategy.php b/‎src/Moka/Plugin/Mockery/MockeryMockingStrategy.php ‎src/Plugin/Mockery/MockeryMockingStrategy.php
diff --git a/‎src/Moka/Plugin/Mockery/MockeryPlugin.php ‎src/Plugin/Mockery/MockeryPlugin.php b/‎src/Moka/Plugin/Mockery/MockeryPlugin.php ‎src/Plugin/Mockery/MockeryPlugin.php
diff --git a/‎src/Moka/Plugin/Mockery/moka.php ‎src/Plugin/Mockery/moka.php b/‎src/Moka/Plugin/Mockery/moka.php ‎src/Plugin/Mockery/moka.php
diff --git a/‎src/Moka/Plugin/PHPUnit/PHPUnitMockingStrategy.php ‎src/Plugin/PHPUnit/PHPUnitMockingStrategy.php
+1-1 b/‎src/Moka/Plugin/PHPUnit/PHPUnitMockingStrategy.php ‎src/Plugin/PHPUnit/PHPUnitMockingStrategy.php
+1-1
diff --git a/‎src/Moka/Plugin/PHPUnit/PHPUnitPlugin.php ‎src/Plugin/PHPUnit/PHPUnitPlugin.php b/‎src/Moka/Plugin/PHPUnit/PHPUnitPlugin.php ‎src/Plugin/PHPUnit/PHPUnitPlugin.php
diff --git a/‎src/Moka/Plugin/PHPUnit/moka.php ‎src/Plugin/PHPUnit/moka.php b/‎src/Moka/Plugin/PHPUnit/moka.php ‎src/Plugin/PHPUnit/moka.php
diff --git a/‎src/Moka/Plugin/Phake/Matcher/FirstStubMatcher.php ‎src/Plugin/Phake/Matcher/FirstStubMatcher.php b/‎src/Moka/Plugin/Phake/Matcher/FirstStubMatcher.php ‎src/Plugin/Phake/Matcher/FirstStubMatcher.php
diff --git a/‎src/Moka/Plugin/Phake/PhakeMockingStrategy.php ‎src/Plugin/Phake/PhakeMockingStrategy.php b/‎src/Moka/Plugin/Phake/PhakeMockingStrategy.php ‎src/Plugin/Phake/PhakeMockingStrategy.php
diff --git a/‎src/Moka/Plugin/Phake/PhakePlugin.php ‎src/Plugin/Phake/PhakePlugin.php b/‎src/Moka/Plugin/Phake/PhakePlugin.php ‎src/Plugin/Phake/PhakePlugin.php
diff --git a/‎src/Moka/Plugin/Phake/moka.php ‎src/Plugin/Phake/moka.php b/‎src/Moka/Plugin/Phake/moka.php ‎src/Plugin/Phake/moka.php
diff --git a/‎src/Moka/Plugin/PluginHelper.php ‎src/Plugin/PluginHelper.php b/‎src/Moka/Plugin/PluginHelper.php ‎src/Plugin/PluginHelper.php
diff --git a/‎src/Moka/Plugin/PluginInterface.php ‎src/Plugin/PluginInterface.php b/‎src/Moka/Plugin/PluginInterface.php ‎src/Plugin/PluginInterface.php
diff --git a/‎src/Moka/Plugin/Prophecy/MethodProphecyHelper.php ‎src/Plugin/Prophecy/MethodProphecyHelper.php b/‎src/Moka/Plugin/Prophecy/MethodProphecyHelper.php ‎src/Plugin/Prophecy/MethodProphecyHelper.php
diff --git a/‎src/Moka/Plugin/Prophecy/ProphecyMockingStrategy.php ‎src/Plugin/Prophecy/ProphecyMockingStrategy.php b/‎src/Moka/Plugin/Prophecy/ProphecyMockingStrategy.php ‎src/Plugin/Prophecy/ProphecyMockingStrategy.php
diff --git a/‎src/Moka/Plugin/Prophecy/ProphecyPlugin.php ‎src/Plugin/Prophecy/ProphecyPlugin.php b/‎src/Moka/Plugin/Prophecy/ProphecyPlugin.php ‎src/Plugin/Prophecy/ProphecyPlugin.php
diff --git a/‎src/Moka/Plugin/Prophecy/Token/AbstractPriorityToken.php ‎src/Plugin/Prophecy/Token/AbstractPriorityToken.php b/‎src/Moka/Plugin/Prophecy/Token/AbstractPriorityToken.php ‎src/Plugin/Prophecy/Token/AbstractPriorityToken.php
diff --git a/‎src/Moka/Plugin/Prophecy/Token/MaxPriorityToken.php ‎src/Plugin/Prophecy/Token/MaxPriorityToken.php b/‎src/Moka/Plugin/Prophecy/Token/MaxPriorityToken.php ‎src/Plugin/Prophecy/Token/MaxPriorityToken.php
diff --git a/‎src/Moka/Plugin/Prophecy/moka.php ‎src/Plugin/Prophecy/moka.php b/‎src/Moka/Plugin/Prophecy/moka.php ‎src/Plugin/Prophecy/moka.php
diff --git a/‎src/Moka/Proxy/ProxyContainer.php ‎src/Proxy/ProxyContainer.php b/‎src/Moka/Proxy/ProxyContainer.php ‎src/Proxy/ProxyContainer.php
diff --git a/‎src/Moka/Proxy/ProxyInterface.php ‎src/Proxy/ProxyInterface.php b/‎src/Moka/Proxy/ProxyInterface.php ‎src/Proxy/ProxyInterface.php
diff --git a/‎src/Moka/Proxy/ProxyTrait.php ‎src/Proxy/ProxyTrait.php b/‎src/Moka/Proxy/ProxyTrait.php ‎src/Proxy/ProxyTrait.php
diff --git a/‎src/Moka/Strategy/AbstractMockingStrategy.php ‎src/Strategy/AbstractMockingStrategy.php b/‎src/Moka/Strategy/AbstractMockingStrategy.php ‎src/Strategy/AbstractMockingStrategy.php
diff --git a/‎src/Moka/Strategy/MockingStrategyInterface.php ‎src/Strategy/MockingStrategyInterface.php b/‎src/Moka/Strategy/MockingStrategyInterface.php ‎src/Strategy/MockingStrategyInterface.php
diff --git a/‎src/Moka/Stub/AbstractStub.php ‎src/Stub/AbstractStub.php b/‎src/Moka/Stub/AbstractStub.php ‎src/Stub/AbstractStub.php
diff --git a/‎src/Moka/Stub/MethodStub.php ‎src/Stub/MethodStub.php b/‎src/Moka/Stub/MethodStub.php ‎src/Stub/MethodStub.php
diff --git a/‎src/Moka/Stub/PropertyStub.php ‎src/Stub/PropertyStub.php b/‎src/Moka/Stub/PropertyStub.php ‎src/Stub/PropertyStub.php
diff --git a/‎src/Moka/Stub/StubHelper.php ‎src/Stub/StubHelper.php b/‎src/Moka/Stub/StubHelper.php ‎src/Stub/StubHelper.php
diff --git a/‎src/Moka/Stub/StubInterface.php ‎src/Stub/StubInterface.php b/‎src/Moka/Stub/StubInterface.php ‎src/Stub/StubInterface.php
diff --git a/‎src/Moka/Stub/StubSet.php ‎src/Stub/StubSet.php b/‎src/Moka/Stub/StubSet.php ‎src/Stub/StubSet.php
diff --git a/‎src/Moka/Tests/AbstractTestClass.php ‎src/Tests/AbstractTestClass.php b/‎src/Moka/Tests/AbstractTestClass.php ‎src/Tests/AbstractTestClass.php
diff --git a/‎src/Moka/Tests/BarTestClass.php ‎src/Tests/BarTestClass.php b/‎src/Moka/Tests/BarTestClass.php ‎src/Tests/BarTestClass.php
diff --git a/‎src/Moka/Tests/BarTestInterface.php ‎src/Tests/BarTestInterface.php b/‎src/Moka/Tests/BarTestInterface.php ‎src/Tests/BarTestInterface.php
diff --git a/‎src/Moka/Tests/FooTestClass.php ‎src/Tests/FooTestClass.php b/‎src/Moka/Tests/FooTestClass.php ‎src/Tests/FooTestClass.php
diff --git a/‎src/Moka/Tests/FooTestInterface.php ‎src/Tests/FooTestInterface.php b/‎src/Moka/Tests/FooTestInterface.php ‎src/Tests/FooTestInterface.php
diff --git a/‎src/Moka/Tests/IncompleteAbstractTestClass.php ‎src/Tests/IncompleteAbstractTestClass.php b/‎src/Moka/Tests/IncompleteAbstractTestClass.php ‎src/Tests/IncompleteAbstractTestClass.php
diff --git a/‎src/Moka/Tests/MokaMockingStrategyTestCase.php ‎src/Tests/MokaMockingStrategyTestCase.php b/‎src/Moka/Tests/MokaMockingStrategyTestCase.php ‎src/Tests/MokaMockingStrategyTestCase.php
diff --git a/‎src/Moka/Tests/MokaPluginTestCase.php ‎src/Tests/MokaPluginTestCase.php b/‎src/Moka/Tests/MokaPluginTestCase.php ‎src/Tests/MokaPluginTestCase.php
diff --git a/‎src/Moka/Tests/PHP71TestClass.php ‎src/Tests/PHP71TestClass.php b/‎src/Moka/Tests/PHP71TestClass.php ‎src/Tests/PHP71TestClass.php
diff --git a/‎src/Moka/Tests/TestInterface.php ‎src/Tests/TestInterface.php b/‎src/Moka/Tests/TestInterface.php ‎src/Tests/TestInterface.php
diff --git a/‎src/Moka/Traits/MokaCleanerTrait.php ‎src/Traits/MokaCleanerTrait.php b/‎src/Moka/Traits/MokaCleanerTrait.php ‎src/Traits/MokaCleanerTrait.php
@@ -27,17 +27,17 @@
   ],
   "autoload": {
     "psr-4": {
-      "Moka\\": "src/Moka/"
+      "Moka\\": "src/"
     },
     "files": [
-      "src/Moka/Plugin/Mockery/MockeryPlugin.php",
-      "src/Moka/Plugin/Mockery/moka.php",
-      "src/Moka/Plugin/Phake/PhakePlugin.php",
-      "src/Moka/Plugin/Phake/moka.php",
-      "src/Moka/Plugin/PHPUnit/PHPUnitPlugin.php",
-      "src/Moka/Plugin/PHPUnit/moka.php",
-      "src/Moka/Plugin/Prophecy/ProphecyPlugin.php",
-      "src/Moka/Plugin/Prophecy/moka.php"
+      "src/Plugin/Mockery/MockeryPlugin.php",
+      "src/Plugin/Mockery/moka.php",
+      "src/Plugin/Phake/PhakePlugin.php",
+      "src/Plugin/Phake/moka.php",
+      "src/Plugin/PHPUnit/PHPUnitPlugin.php",
+      "src/Plugin/PHPUnit/moka.php",
+      "src/Plugin/Prophecy/ProphecyPlugin.php",
+      "src/Plugin/Prophecy/moka.php"
     ]
   },
   "autoload-dev": {
@@ -53,15 +53,18 @@
   },
   "require-dev": {
     "friendsofphp/php-cs-fixer": "^2.3",
-    "phpunit/phpunit": "^6.0",
-    "phpspec/prophecy": "^1.7",
+    "mockery/mockery": "^0.9.9",
     "phake/phake": "^3.0",
-    "mockery/mockery": "^0.9.9"
+    "phpspec/prophecy": "^1.7",
+    "phpunit/phpunit": "^6.0"
   },
   "suggest": {
     "phpspec/prophecy": "To allow loading of ProphecyPlugin",
     "mockery/mockery": "To allow loading of MockeryPlugin",
     "phake/phake": "To allow loading of PhakePlugin",
     "facile-it/paraunit": "For parallel test running; it's faster!"
+  },
+  "config": {
+    "sort-packages": true
   }
 }
@@ -24,10 +24,10 @@
         <whitelist>
             <directory>src</directory>
             <exclude>
-                <directory>src/Moka/Exception</directory>
-                <directory suffix="moka.php">src/Moka/Plugin/*</directory>
-                <directory>src/Moka/Tests</directory>
-                <directory>src/Moka/Traits</directory>
+                <directory>src/Exception</directory>
+                <directory suffix="moka.php">src/Plugin/*</directory>
+                <directory>src/Tests</directory>
+                <directory>src/Traits</directory>
             </exclude>
         </whitelist>
     </filter>
 
@@ -17,7 +17,7 @@
 class PHPUnitMockingStrategy extends AbstractMockingStrategy
 {
     const CLASS_NAME = MockGenerator::class;
-    const PACKAGE_NAME = 'phpunit/phpunit-mock-object';
+    const PACKAGE_NAME = 'phpunit/phpunit-mock-objects';
 
     /**
      * @var MockGenerator
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`class PHPUnitMockingStrategy extends AbstractMockingStrategy`
`18`	`18`	`{`
`19`	`19`	`const CLASS_NAME = MockGenerator::class;`
`20`		`- const PACKAGE_NAME = 'phpunit/phpunit-mock-object';`
	`20`	`+ const PACKAGE_NAME = 'phpunit/phpunit-mock-objects';`
`21`	`21`
`22`	`22`	`/**`
`23`	`23`	`* @var MockGenerator`