moved to go-aop 2.0

Author: DavertMik

VERSION

@@ -1 +1 @@
-2.0.0-alpha
+2.0.0-RC

composer.json

@@ -14,7 +14,7 @@
        },
     "require": {
         "php": ">=5.4.0",
-        "goaop/framework": "2.0.0-alpha.1",
+        "goaop/framework": "^2.0.0",
         "symfony/finder": "~2.4|~3.0"
     },
     "require-dev": {

src/AspectMock/Intercept/BeforeMockTransformer.php

@@ -1,8 +1,8 @@
 <?php
 namespace AspectMock\Intercept;
-use Go\Instrument\CleanableMemory;
 use Go\Instrument\Transformer\StreamMetaData;
 use Go\Instrument\Transformer\WeavingTransformer;
+use Go\ParserReflection\ReflectionFile;
 
 class BeforeMockTransformer extends WeavingTransformer
 {
@@ -13,22 +13,13 @@ public function transform(StreamMetaData $metadata)
     {
         $fileName = $metadata->uri;
 
-        try {
-            CleanableMemory::enterProcessing();
-            $parsedSource = $this->broker->processString($metadata->source, $fileName, true);
-        } catch (FileProcessingException $e) {
-            CleanableMemory::leaveProcessing();
+        $reflectedFile = new ReflectionFile($fileName);
+        $namespaces = $reflectedFile->getFileNamespaces();
 
-            return false;
-        }
-
-        /** @var $namespaces ParsedFileNamespace[] */
-        $namespaces = $parsedSource->getNamespaces();
         $dataArray = explode("\n", $metadata->source);
 
         foreach ($namespaces as $namespace) {
 
-            /** @var $classes ParsedClass[] */
             $classes = $namespace->getClasses();
             foreach ($classes as $class) {
 
@@ -44,8 +35,7 @@ public function transform(StreamMetaData $metadata)
 
                 $methods = $class->getMethods();
                 foreach ($methods as $method) {
-                    /** @var $method ReflectionMethod`  * */
-                    if ($method->getDeclaringClassName() != $class->getName()) {
+                    if ($method->getDeclaringClass()->name != $class->getName()) {
                         continue;
                     }
                     // methods from traits have the same declaring class name, so check that the filenames match, too
@@ -68,7 +58,6 @@ public function transform(StreamMetaData $metadata)
                     $params = [];
 
                     foreach ($reflectedParams as $reflectedParam) {
-                        /** @var $reflectedParam ReflectionParameter  * */
                         $params[] = ($reflectedParam->isPassedByReference() ? '&$' : '$') . $reflectedParam->getName();
                     }
                     $params = implode(", ", $params);
@@ -95,5 +84,4 @@ public function transform(StreamMetaData $metadata)
         }
         $metadata->source = implode("\n", $dataArray);
     }
-
-}
+}

src/AspectMock/Kernel.php

@@ -1,28 +1,28 @@
 <?php
 namespace AspectMock;
+
 use AspectMock\Core\Registry;
 use AspectMock\Intercept\BeforeMockTransformer;
-use AspectMock\Intercept\ClosureTransformer;
-use AspectMock\Intercept\LoadPreachedTransformer;
 use Go\Core\AspectContainer;
 use Go\Core\AspectKernel;
-use Go\Instrument\CleanableMemory;
-use Go\Instrument\Transformer\FilterInjectorTransformer;
-use Symfony\Component\Finder\Finder;
 use Go\Instrument\ClassLoading\SourceTransformingLoader;
 use Go\Instrument\Transformer\CachingTransformer;
+use Go\Instrument\Transformer\FilterInjectorTransformer;
 use Go\Instrument\Transformer\MagicConstantTransformer;
-use TokenReflection;
+use Symfony\Component\Finder\Finder;
 
-require_once __DIR__.'/Core/Registry.php';
+require_once __DIR__ . '/Core/Registry.php';
 
 class Kernel extends AspectKernel
 {
-    public function init(array $options = array())
+    public function init(array $options = [])
     {
-        if (!isset($options['excludePaths'])) $options['excludePaths'] = [];
-        if (!isset($options['debug'])) $options['debug'] = true;
+        if (!isset($options['excludePaths'])) {
+            $options['excludePaths'] = [];
+        }
+        $options['debug'] = true;
         $options['excludePaths'][] = __DIR__;
+
         parent::init($options);
     }
 
@@ -60,7 +60,7 @@ protected function registerTransformers()
     {
         $cachePathManager = $this->getContainer()->get('aspect.cache.path.manager');;
 
-        $sourceTransformers = array(
+        $sourceTransformers = [
             new FilterInjectorTransformer($this, SourceTransformingLoader::getId(), $cachePathManager),
             new MagicConstantTransformer($this),
             new BeforeMockTransformer(
@@ -69,11 +69,11 @@ protected function registerTransformers()
                 $cachePathManager,
                 $this->getContainer()->get('aspect.cached.loader')
             )
-        );
+        ];
 
-        return array(
+        return [
             new CachingTransformer($this, $sourceTransformers, $cachePathManager)
-        );
+        ];
     }
 }
 

tests/_bootstrap.php

@@ -7,7 +7,6 @@
 
 $kernel = \AspectMock\Kernel::getInstance();
 $kernel->init([
-    'debug' => true,
     'cacheDir' => __DIR__.'/_data/cache',
     'includePaths' => [__DIR__.'/_data/demo'],
     'interceptFunctions' => true

tests/_helpers/_generated/CodeGuyActions.php

@@ -1,4 +1,4 @@
-<?php  //[STAMP] 24dfed59965666295fe7d207e9aa4d08
+<?php  //[STAMP] 00534a0c760a69fedaa8647d78516eda
 namespace _generated;
 
 // This class was automatically generated by build task