Namespace change

.gitignore

@@ -1,2 +1,5 @@
 /vendor/
 composer.lock
+
+# Test specific ignores
+tests/resources/cache

bin/goaop-zf2-warmup

@@ -2,7 +2,7 @@
 <?php
 
 use Go\Core\AspectKernel;
-use Go\ZF2\GoAopModule\Console\Warmup\Zf2WarmupCommand;
+use Go\Zend\Framework\Console\Command\WarmupCommand;
 use Symfony\Component\Console\Application;
 
 
@@ -26,7 +26,8 @@ if (!class_exists('Symfony\Component\Console\Application')) {
     );
 }
 
+
 $app = new Application('Go! AOP', AspectKernel::VERSION);
-$app->add(new Zf2WarmupCommand());
+$app->add(new WarmupCommand());
 $app->run();
 

composer.json

@@ -6,7 +6,7 @@
     "license": "MIT",
     "require": {
         "goaop/framework": "^1.0|^2.0",
-        "zendframework/zend-modulemanager": "^2.0 | ^3.0"
+        "zendframework/zend-modulemanager": "^2.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^5.0 | ^6.0",
@@ -15,7 +15,11 @@
         "zendframework/zend-serializer": "^2.0",
         "zendframework/zend-log": "^2.0",
         "zendframework/zend-i18n": "^2.0",
-        "zendframework/zend-console": "^2.0"
+        "zendframework/zend-console": "^2.0",
+        "symfony/console": "^3.0 | ^4.0"
+    },
+    "suggest": {
+        "symfony/console": "Required to use goaop console warmup"
     },
     "authors": [
         {
@@ -30,12 +34,12 @@
     "bin": ["bin/goaop-zf2-warmup"],
     "autoload": {
         "psr-4": {
-            "Go\\ZF2\\GoAopModule\\" : "src/"
+            "Go\\Zend\\Framework\\" : "src/"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "Go\\ZF2\\GoAopModule\\Tests\\" : "tests/"
+            "Go\\Zend\\Framework\\Tests\\" : "tests/"
         }
     }
 }

config/module.config.php

@@ -9,8 +9,8 @@
 use Go\Core\AspectContainer;
 use Go\Core\AspectKernel;
 use Go\Core\GoAspectContainer;
-use Go\ZF2\GoAopModule\Factory\AspectContainerFactory;
-use Go\ZF2\GoAopModule\Factory\AspectKernelFactory;
+use Go\Zend\Framework\Factory\AspectContainerFactory;
+use Go\Zend\Framework\Factory\AspectKernelFactory;
 
 $basicDirectory = defined('APPLICATION_PATH') ? APPLICATION_PATH : __DIR__ . '/../../../..';
 
@@ -94,12 +94,14 @@
 ];
 
 return [
-    'goaop_module'    => $moduleConfig,
+    \Go\Zend\Framework\Module::CONFIG_KEY => $moduleConfig,
+
     'service_manager' => [
         'factories' => [
             AspectKernel::class    => AspectKernelFactory::class,
             AspectContainer::class => AspectContainerFactory::class,
         ]
     ],
-    'goaop_aspect' => []
+
+    \Go\Zend\Framework\Module::ASPECT_CONFIG_KEY => []
 ];

phpunit.xml.dist

@@ -13,6 +13,7 @@
         <testsuite name="Go! AOP ZF Module Test Suite">
             <directory>./tests/Integration/</directory>
             <directory>./tests/Unit/</directory>
+            <directory>./tests/Functional/</directory>
         </testsuite>
     </testsuites>
     <filter>

src/Console/Warmup/Zf2WarmupCommand.php → src/Console/Command/WarmupCommand.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Go\ZF2\GoAopModule\Console\Warmup;
+namespace Go\Zend\Framework\Console\Command;
 
 use Go\Core\AspectKernel;
 use Go\Instrument\ClassLoading\SourceTransformingLoader;
@@ -11,7 +11,7 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
-class Zf2WarmupCommand extends Command
+class WarmupCommand extends Command
 {
     /**
      * {@inheritDoc}

src/Factory/AspectContainerFactory.php

@@ -8,7 +8,7 @@
  * with this source code in the file LICENSE.
  */
 
-namespace Go\ZF2\GoAopModule\Factory;
+namespace Go\Zend\Framework\Factory;
 
 use Go\Core\AspectKernel;
 use Interop\Container\ContainerInterface;

src/Factory/AspectKernelFactory.php

@@ -8,9 +8,10 @@
  * with this source code in the file LICENSE.
  */
 
-namespace Go\ZF2\GoAopModule\Factory;
+namespace Go\Zend\Framework\Factory;
 
-use Go\ZF2\GoAopModule\Kernel\AspectZf2Kernel;
+use Go\Zend\Framework\Kernel\AspectKernel;
+use Go\Zend\Framework\Module;
 use Interop\Container\ContainerInterface;
 use Zend\ServiceManager\FactoryInterface;
 use Zend\ServiceManager\ServiceLocatorInterface;
@@ -43,8 +44,8 @@ public function __invoke(ContainerInterface $container, $requestedName, array $o
      */
     public function createService(ServiceLocatorInterface $serviceLocator)
     {
-        $aspectKernel = AspectZf2Kernel::getInstance();
-        $aspectKernel->init($serviceLocator->get('config')['goaop_module']);
+        $aspectKernel = AspectKernel::getInstance();
+        $aspectKernel->init($serviceLocator->get('config')[Module::CONFIG_KEY]);
 
         return $aspectKernel;
     }

src/Kernel/AspectZf2Kernel.php → src/Kernel/AspectKernel.php

@@ -8,16 +8,15 @@
  * with this source code in the file LICENSE.
  */
 
-namespace Go\ZF2\GoAopModule\Kernel;
+namespace Go\Zend\Framework\Kernel;
 
 
 use Go\Core\AspectContainer;
-use Go\Core\AspectKernel;
 
 /**
- * ZF2 aspect kernel class
+ * Aspect kernel class
  */
-class AspectZf2Kernel extends AspectKernel
+class AspectKernel extends \Go\Core\AspectKernel
 {
 
     /**

src/Module.php

@@ -8,7 +8,7 @@
  * with this source code in the file LICENSE.
  */
 
-namespace Go\ZF2\GoAopModule;
+namespace Go\Zend\Framework;
 
 use Go\Core\AspectContainer;
 use Zend\ModuleManager\Feature\ConfigProviderInterface;
@@ -17,10 +17,13 @@
 use Zend\ModuleManager\ModuleManagerInterface;
 
 /**
- * ZF2 Module for registration of Go! AOP Framework
+ * Module for registration of Go! AOP Framework
  */
 class Module implements ConfigProviderInterface, InitProviderInterface
 {
+    const CONFIG_KEY = 'goaop_module';
+    const ASPECT_CONFIG_KEY = 'goaop_aspect';
+
     /**
      * @inheritDoc
      */
@@ -44,7 +47,8 @@ public function initializeAspects(ModuleEvent $e)
         /** @var AspectContainer $aspectContainer */
         $aspectContainer = $serviceManager->get(AspectContainer::class);
         $config          = $serviceManager->get('config');
-        $listOfAspects   = $config['goaop_aspect'];
+        $listOfAspects   = $config[self::ASPECT_CONFIG_KEY];
+
         foreach ($listOfAspects as $aspectService) {
             $aspect = $serviceManager->get($aspectService);
             $aspectContainer->registerAspect($aspect);

tests/Advice/TestAdvice.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Go\Zend\Framework\Tests\Advice;
+
+/**
+ * @package Go\Zend\Framework\Tests\Advice
+ */
+class TestAdvice
+{
+    public function getTest($parameter)
+    {
+    }
+}

tests/Aspect/TestAspect.php

@@ -1,13 +1,21 @@
 <?php
 
-namespace Go\ZF2\GoAopModule\Tests\Aspect;
+namespace Go\Zend\Framework\Tests\Aspect;
 
 use Go\Aop\Aspect;
+use Go\Aop\Intercept\MethodInvocation;
+use Go\Lang\Annotation\Around;
 
 /**
- * @package Go\ZF2\GoAopModule\Tests\Aspect
+ * @package Go\Zend\Framework\Tests\Aspect
  */
 class TestAspect implements Aspect
 {
-
+    /**
+     * @param MethodInvocation $invocation
+     * @Around("execution(public Go\Zend\Framework\Tests\Advice\TestAdvice->get*(*))")
+     */
+    public function aspectAdvice(MethodInvocation $invocation)
+    {
+    }
 }

tests/Functional/WarmupTest.php

@@ -0,0 +1,45 @@
+<?php
+
+namespace Go\Zend\Framework\Tests\Functional;
+
+use Go\Zend\Framework\Console\Command\WarmupCommand;
+use PHPUnit\Framework\TestCase;
+use Prophecy\Argument;
+use Symfony\Component\Console\Input\ArgvInput;
+use Symfony\Component\Console\Input\Input;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputDefinition;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+/**
+ * @package Go\Zend\Framework\Tests\Functional
+ */
+class WarmupTest extends TestCase
+{
+    /**
+     * @test
+     */
+    public function itShouldFindAdviceAccordingToConfig()
+    {
+        $input = $this->prophesize(InputInterface::class);
+        $input->bind(Argument::any())->willReturn();
+        $input->isInteractive()->willReturn(false);
+        $input->hasArgument(Argument::any())->willReturn(false);
+        $input->validate()->willReturn();
+
+        $input->getArgument('applicationConfig')
+            ->willReturn(__DIR__ . '/../resources/application_config.php');
+
+        $output = $this->getMockBuilder(OutputInterface::class)
+            ->setMethods(['writeln'])
+            ->getMockForAbstractClass();
+
+        $output->expects($this->at(1))
+            ->method('writeln')
+            ->with('Total <info>1</info> files to process.');
+
+        $command = new WarmupCommand();
+        $command->run($input->reveal(), $output);
+    }
+}

tests/Integration/ModuleTest.php

@@ -1,15 +1,15 @@
 <?php
 
-namespace Go\ZF2\GoAopModule\Tests\Integration;
+namespace Go\Zend\Framework\Tests\Integration;
 
 use Go\Core\AspectContainer;
 use Go\Core\GoAspectContainer;
-use Go\ZF2\GoAopModule\Tests\Aspect\TestAspect;
+use Go\Zend\Framework\Tests\Aspect\TestAspect;
 use PHPUnit\Framework\TestCase;
 use Zend\Mvc\Application;
 
 /**
- * @package Go\ZF2\GoAopModule\Tests\Integration
+ * @package Go\Zend\Framework\Tests\Integration
  */
 class ModuleTest extends TestCase
 {

tests/Unit/Factory/AspectContainerFactoryTest.php

@@ -1,15 +1,15 @@
 <?php
 
-namespace Go\ZF2\GoAopModule\Tests\Unit\Factory;
+namespace Go\Zend\Framework\Tests\Unit\Factory;
 
 use Go\Core\AspectContainer;
 use Go\Core\AspectKernel;
-use Go\ZF2\GoAopModule\Factory\AspectContainerFactory;
+use Go\Zend\Framework\Factory\AspectContainerFactory;
 use PHPUnit\Framework\TestCase;
 use Zend\ServiceManager\ServiceLocatorInterface;
 
 /**
- * @package Go\ZF2\GoAopModule\Tests\Unit\Factory
+ * @package Go\Zend\Framework\Tests\Unit\Factory
  */
 class AspectContainerFactoryTest extends TestCase
 {

tests/Unit/Factory/AspectKernelFactoryTest.php

@@ -1,14 +1,15 @@
 <?php
 
-namespace Go\ZF2\GoAopModule\Tests\Unit\Factory;
+namespace Go\Zend\Framework\Tests\Unit\Factory;
 
 use Go\Core\AspectKernel;
-use Go\ZF2\GoAopModule\Factory\AspectKernelFactory;
+use Go\Zend\Framework\Factory\AspectKernelFactory;
+use Go\Zend\Framework\Module;
 use PHPUnit\Framework\TestCase;
 use Zend\ServiceManager\ServiceLocatorInterface;
 
 /**
- * @package Go\ZF2\GoAopModule\Tests\Unit\Factory
+ * @package Go\Zend\Framework\Tests\Unit\Factory
  */
 class AspectKernelFactoryTest extends TestCase
 {
@@ -19,7 +20,7 @@ public function itCreatesKernelOnInvoke()
     {
         $serviceLocator = $this->prophesize(ServiceLocatorInterface::class);
         $serviceLocator->get('config')
-            ->willReturn(['goaop_module' => require __DIR__ . '/../../resources/goaop_module.php'])
+            ->willReturn([Module::CONFIG_KEY => require __DIR__ . '/../../resources/goaop_module.php'])
             ->shouldBeCalled();
 
         $factory = new AspectKernelFactory();
@@ -40,7 +41,7 @@ public function itCreatesKernelOnCreateService()
     {
         $serviceLocator = $this->prophesize(ServiceLocatorInterface::class);
         $serviceLocator->get('config')
-            ->willReturn(['goaop_module' => require __DIR__ . '/../../resources/goaop_module.php'])
+            ->willReturn([Module::CONFIG_KEY => require __DIR__ . '/../../resources/goaop_module.php'])
             ->shouldBeCalled();
 
         $factory = new AspectKernelFactory();

tests/Unit/ModuleTest.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace Go\ZF2\GoAopModule\Tests\Unit;
+namespace Go\Zend\Framework\Tests\Unit;
 
 use Go\Aop\Aspect;
 use Go\Core\AspectContainer;
-use Go\ZF2\GoAopModule\Module;
+use Go\Zend\Framework\Module;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Zend\EventManager\EventManagerInterface;
@@ -13,7 +13,7 @@
 use Zend\ServiceManager\ServiceManager;
 
 /**
- * @package Go\ZF2\GoAopModule\Tests\Unit
+ * @package Go\Zend\Framework\Tests\Unit
  */
 class ModuleTest extends TestCase
 {
@@ -66,7 +66,7 @@ public function itRegisterAspectsOnInitializeAspects()
             ->willReturn($aspectContainer->reveal())
             ->shouldBeCalled();
         $serviceManager->get('config')
-            ->willReturn(['goaop_aspect' => ['testAspect']])
+            ->willReturn([Module::ASPECT_CONFIG_KEY => ['testAspect']])
             ->shouldBeCalled();
         $serviceManager->get('testAspect')
             ->willReturn($aspect)