Merge pull request #72 from younes0/master

raulfraile · raulfraile · commit c0d6d66fe901 · 2015-12-21T10:07:40.000+01:00
renamed Type classes for php7 support
diff --git a/.travis.yml b/.travis.yml
@@ -5,6 +5,7 @@ php:
   - 5.4
   - 5.5
   - 5.6
+  - 7.0
   - hhvm-nightly
 
 matrix:
diff --git a/src/Ladybug/Renderer/Twig/Extension/BaseExtension.php b/src/Ladybug/Renderer/Twig/Extension/BaseExtension.php
@@ -40,9 +40,9 @@ public function getName()
     public function getFunctions()
     {
         return array(
-            'render_type' => new \Twig_Function_Method(
-                $this,
-                'renderTypeFunction',
+            'render_type' => new \Twig_SimpleFunction(
+                'renderTypeFunction', 
+                array($this, 'renderTypeFunction'),
                 array('needs_environment' => true, 'is_safe' => array('html'))
             )
         );
@@ -56,16 +56,8 @@ public function getFunctions()
     public function getFilters()
     {
         return array(
-            'repeat' => new \Twig_Filter_Method(
-                $this,
-                'getRepeat',
-                array('is_safe' => array('html'))
-            ),
-            'pad' => new \Twig_Filter_Method(
-                $this,
-                'getPad',
-                array()
-            )
+            'repeat' => new \Twig_SimpleFilter('getRepeat', array($this, 'getRepeat'), array('is_safe' => array('html'))),
+            'pad' => new \Twig_SimpleFilter('getPad', array($this, 'getPad')),
         );
     }
 
diff --git a/src/Ladybug/Renderer/Twig/Extension/ConsoleExtension.php b/src/Ladybug/Renderer/Twig/Extension/ConsoleExtension.php
@@ -32,11 +32,7 @@ public function getName()
     public function getFilters()
     {
         return array_merge(parent::getFilters(), array(
-            'tags' => new \Twig_Filter_Method(
-                $this,
-                'getTags',
-                array('is_safe' => array('html'))
-            )
+            'tags' => new \Twig_SimpleFilter('getTags', array($this, 'getTags'), array('is_safe' => array('html'))),
         ));
     }
 
diff --git a/src/Ladybug/Resources/container/types.xml b/src/Ladybug/Resources/container/types.xml
@@ -6,23 +6,23 @@
 
     <services>
 
-        <service id="type_null" class="Ladybug\Type\Null">
+        <service id="type_null" class="Ladybug\Type\NullType">
             <tag name="ladybug.type" />
         </service>
 
-        <service id="type_bool" class="Ladybug\Type\Bool">
+        <service id="type_bool" class="Ladybug\Type\BoolType">
             <tag name="ladybug.type" />
         </service>
 
-        <service id="type_int" class="Ladybug\Type\Int">
+        <service id="type_int" class="Ladybug\Type\IntType">
             <tag name="ladybug.type" />
         </service>
 
-        <service id="type_float" class="Ladybug\Type\Float">
+        <service id="type_float" class="Ladybug\Type\FloatType">
             <tag name="ladybug.type" />
         </service>
 
-        <service id="type_string" class="Ladybug\Type\String">
+        <service id="type_string" class="Ladybug\Type\StringType">
             <tag name="ladybug.type" />
         </service>
 
@@ -41,7 +41,7 @@
             <tag name="ladybug.type" />
         </service>
 
-        <service id="type_resource" class="Ladybug\Type\Resource">
+        <service id="type_resource" class="Ladybug\Type\ResourceType">
             <argument type="service" id="type_factory"></argument>
             <argument type="service" id="inspector_manager"></argument>
             <argument type="service" id="metadata_resolver"></argument>
diff --git a/src/Ladybug/Type/BoolType.php b/src/Ladybug/Type/BoolType.php
@@ -16,7 +16,7 @@
 /**
  * Bool is an abstraction of a primitive variable of type 'bool'
  */
-class Bool extends AbstractType
+class BoolType extends AbstractType
 {
 
     const TYPE_ID = 'bool';
diff --git a/src/Ladybug/Type/FloatType.php b/src/Ladybug/Type/FloatType.php
@@ -16,7 +16,7 @@
 /**
  * Float is an abstraction of a primitive variable of type 'float'
  */
-class Float extends AbstractType
+class FloatType extends AbstractType
 {
 
     const TYPE_ID = 'float';
diff --git a/src/Ladybug/Type/IntType.php b/src/Ladybug/Type/IntType.php
@@ -16,7 +16,7 @@
 /**
  * Int is an abstraction of a primitive variable of type 'int'
  */
-class Int extends AbstractType
+class IntType extends AbstractType
 {
 
     const TYPE_ID = 'int';
diff --git a/src/Ladybug/Type/NullType.php b/src/Ladybug/Type/NullType.php
@@ -16,7 +16,7 @@
 /**
  * Null is an abstraction of a primitive variable of type 'null'
  */
-class Null extends AbstractType
+class NullType extends AbstractType
 {
     const TYPE_ID = 'null';
 
diff --git a/src/Ladybug/Type/ResourceType.php b/src/Ladybug/Type/ResourceType.php
@@ -18,7 +18,7 @@
 use Ladybug\Inspector\InspectorManager;
 use Ladybug\Model\VariableWrapper;
 
-class Resource extends AbstractType
+class ResourceType extends AbstractType
 {
 
     const TYPE_ID = 'resource';
diff --git a/src/Ladybug/Type/StringType.php b/src/Ladybug/Type/StringType.php
@@ -16,7 +16,7 @@
 /**
  * String is an abstraction of a primitive variable of type 'string'
  */
-class String extends AbstractType
+class StringType extends AbstractType
 {
     const TYPE_ID = 'string';
 
diff --git a/tests/Ladybug/Tests/Model/VariableWrapperTest.php b/tests/Ladybug/Tests/Model/VariableWrapperTest.php
@@ -10,7 +10,7 @@ class VariableWrapperTest extends \PHPUnit_Framework_TestCase
 
     public function testObjectCreation()
     {
-        $var = new \Ladybug\Type\Int();
+        $var = new \Ladybug\Type\IntType();
         $var->load(1);
 
         $variableWrapper = new VariableWrapper(1, $var, VariableWrapper::TYPE_CLASS);
diff --git a/tests/Ladybug/Tests/Type/BoolTypeTest.php b/tests/Ladybug/Tests/Type/BoolTypeTest.php
@@ -4,15 +4,15 @@
 
 use Ladybug\Type;
 
-class BoolTest extends \PHPUnit_Framework_TestCase
+class BoolTypeTest extends \PHPUnit_Framework_TestCase
 {
 
     /** @var Type\Bool $type */
     protected $type;
 
     public function setUp()
     {
-        $this->type = new Type\Bool();
+        $this->type = new Type\BoolType();
     }
 
     public function testLoaderForValidValues()
diff --git a/tests/Ladybug/Tests/Type/FactoryTypeTest.php b/tests/Ladybug/Tests/Type/FactoryTypeTest.php
@@ -16,7 +16,7 @@ public function setUp()
         /*$maxlevel = 8;
 
         $factoryTypeMock = m::mock('Ladybug\Type\FactoryType');
-        $factoryTypeMock->shouldReceive('factory')->with(m::anyOf(1, 2, 3), m::any())->andReturn(new Type\Int());
+        $factoryTypeMock->shouldReceive('factory')->with(m::anyOf(1, 2, 3), m::any())->andReturn(new Type\IntType());
 */
 
         $managerInspectorMock = m::mock('Ladybug\Inspector\InspectorManager');
@@ -26,14 +26,14 @@ public function setUp()
         $metadataResolverMock->shouldReceive('has')->andReturn(false);
 
         $this->factory = new Type\FactoryType();
-        $this->factory->add(new Type\Int(), 'type_int');
-        $this->factory->add(new Type\Bool(), 'type_bool');
-        $this->factory->add(new Type\Null(), 'type_null');
-        $this->factory->add(new Type\Float(), 'type_float');
-        $this->factory->add(new Type\String(), 'type_string');
+        $this->factory->add(new Type\IntType(), 'type_int');
+        $this->factory->add(new Type\BoolType(), 'type_bool');
+        $this->factory->add(new Type\NullType(), 'type_null');
+        $this->factory->add(new Type\FloatType(), 'type_float');
+        $this->factory->add(new Type\StringType(), 'type_string');
         $this->factory->add(new Type\Vector\Container(8, $this->factory), 'type_array');
         $this->factory->add(new Type\Object\Container(8, $this->factory, $managerInspectorMock, $metadataResolverMock), 'type_object');
-        $this->factory->add(new Type\Resource($this->factory, $managerInspectorMock, $metadataResolverMock), 'type_resource');
+        $this->factory->add(new Type\ResourceType($this->factory, $managerInspectorMock, $metadataResolverMock), 'type_resource');
     }
 
     public function tearDown()
@@ -45,35 +45,35 @@ public function testFactoryForIntValues()
     {
         $var = 1;
         $type = $this->factory->factory($var);
-        $this->assertEquals('Ladybug\\Type\\Int', get_class($type));
+        $this->assertEquals('Ladybug\\Type\\IntType', get_class($type));
     }
 
     public function testFactoryForBoolValues()
     {
         $var = true;
         $type = $this->factory->factory($var);
-        $this->assertEquals('Ladybug\\Type\\Bool', get_class($type));
+        $this->assertEquals('Ladybug\\Type\\BoolType', get_class($type));
     }
 
     public function testFactoryForFloatValues()
     {
         $var = 1.2;
         $type = $this->factory->factory($var);
-        $this->assertEquals('Ladybug\\Type\\Float', get_class($type));
+        $this->assertEquals('Ladybug\\Type\\FloatType', get_class($type));
     }
 
     public function testFactoryForNullValues()
     {
         $var = null;
         $type = $this->factory->factory($var);
-        $this->assertEquals('Ladybug\\Type\\Null', get_class($type));
+        $this->assertEquals('Ladybug\\Type\\NullType', get_class($type));
     }
 
     public function testFactoryForStringValues()
     {
         $var = 'test';
         $type = $this->factory->factory($var);
-        $this->assertEquals('Ladybug\\Type\\String', get_class($type));
+        $this->assertEquals('Ladybug\\Type\\StringType', get_class($type));
     }
 
     public function testFactoryForArrayValues()
@@ -94,15 +94,15 @@ public function testFactoryForResourceValues()
     {
         $var = fopen(__DIR__ . '/../../../files/test.txt', 'rb');
         $type = $this->factory->factory($var);
-        $this->assertInstanceOf('Ladybug\\Type\\Resource', $type);
+        $this->assertInstanceOf('Ladybug\\Type\\ResourceType', $type);
     }
 
     public function testFactoryForUnknownResourceValues()
     {
         $var = fopen(__DIR__ . '/../../../files/test.txt', 'rb');
         fclose($var); // Turns resource into type "Unknown"
         $type = $this->factory->factory($var);
-        $this->assertInstanceOf('Ladybug\\Type\\Resource', $type);
+        $this->assertInstanceOf('Ladybug\\Type\\ResourceType', $type);
     }
 
     /*public function testLoaderForOtherType()
diff --git a/tests/Ladybug/Tests/Type/FloatTypeTest.php b/tests/Ladybug/Tests/Type/FloatTypeTest.php
@@ -4,15 +4,15 @@
 
 use Ladybug\Type;
 
-class FloatTest extends \PHPUnit_Framework_TestCase
+class FloatTypeTest extends \PHPUnit_Framework_TestCase
 {
 
     /** @var Type\Float $type */
     protected $type;
 
     public function setUp()
     {
-        $this->type = new Type\Float();
+        $this->type = new Type\FloatType();
     }
 
     public function testLoaderForValidValues()
diff --git a/tests/Ladybug/Tests/Type/IntTypeTest.php b/tests/Ladybug/Tests/Type/IntTypeTest.php
@@ -4,15 +4,15 @@
 
 use Ladybug\Type;
 
-class IntTest extends \PHPUnit_Framework_TestCase
+class IntTypeTest extends \PHPUnit_Framework_TestCase
 {
 
     /** @var Type\Int $type */
     protected $type;
 
     public function setUp()
     {
-        $this->type = new Type\Int();
+        $this->type = new Type\IntType();
     }
 
     public function testLoaderForValidValues()
diff --git a/tests/Ladybug/Tests/Type/NullTypeTest.php b/tests/Ladybug/Tests/Type/NullTypeTest.php
@@ -4,15 +4,15 @@
 
 use Ladybug\Type;
 
-class NullTest extends \PHPUnit_Framework_TestCase
+class NullTypeTest extends \PHPUnit_Framework_TestCase
 {
 
     /** @var Type\Null $type */
     protected $type;
 
     public function setUp()
     {
-        $this->type = new Type\Null();
+        $this->type = new Type\NullType();
     }
 
     public function testLoaderForValidValues()
diff --git a/tests/Ladybug/Tests/Type/Object/BadTypeHintedParameterContainerTest.php b/tests/Ladybug/Tests/Type/Object/BadTypeHintedParameterContainerTest.php
@@ -16,7 +16,7 @@ class BadTypeHintedParameterContainerTest extends \PHPUnit_Framework_TestCase
     protected function setUp()
     {
         $factory = new Type\FactoryType();
-        $factory->add(new Type\Null(), 'type_null');
+        $factory->add(new Type\NullType(), 'type_null');
 
         $managerInspectorMock = m::mock('Ladybug\Inspector\InspectorManager');
         $managerInspectorMock->shouldReceive('get')->andReturn(null);
@@ -53,7 +53,7 @@ public function testDumperDoesNotCrashOnWrongTypeHints()
         $badTypeHinted = $privateMethod->getParameterByName('baz');
         $this->assertEquals('[Undefined Type Hint]', $badTypeHinted->getType());
         $this->assertFalse($badTypeHinted->isReference());
-        $this->assertInstanceOf('Ladybug\Type\Null', $badTypeHinted->getDefaultValue());
+        $this->assertInstanceOf('Ladybug\Type\NullType', $badTypeHinted->getDefaultValue());
     }
 }
 
diff --git a/tests/Ladybug/Tests/Type/Object/ContainerTest.php b/tests/Ladybug/Tests/Type/Object/ContainerTest.php
@@ -17,7 +17,7 @@ public function setUp()
         $maxlevel = 8;
         $factoryTypeMock = m::mock('Ladybug\Type\FactoryType');
         $factoryTypeMock->shouldReceive('factory')->with(m::anyOf(1, 2, 3, 4), m::any())->andReturnUsing(function($var, $level) {
-            $intType = new Type\Int();
+            $intType = new Type\IntType();
             $intType->load($var, $level);
 
             return $intType;
@@ -61,29 +61,29 @@ public function testLoaderForValidValues()
         $this->assertInstanceOf('Ladybug\Type\Object\Property', $privateProperty);
         $this->assertEquals('privateProperty', $privateProperty->getName());
         $this->assertEquals(VisibilityInterface::VISIBILITY_PRIVATE, $privateProperty->getVisibility());
-        $this->assertInstanceOf('Ladybug\Type\Int', $privateProperty->getValue());
+        $this->assertInstanceOf('Ladybug\Type\IntType', $privateProperty->getValue());
         $this->assertEquals(2, $privateProperty->getLevel());
         $this->assertEquals('Ladybug\Tests\Type\Object\Bar', $privateProperty->getOwner());
 
         $this->assertInstanceOf('Ladybug\Type\Object\Property', $protectedProperty);
         $this->assertEquals('protectedProperty', $protectedProperty->getName());
         $this->assertEquals(VisibilityInterface::VISIBILITY_PROTECTED, $protectedProperty->getVisibility());
-        $this->assertInstanceOf('Ladybug\Type\Int', $protectedProperty->getValue());
+        $this->assertInstanceOf('Ladybug\Type\IntType', $protectedProperty->getValue());
         $this->assertEquals(2, $protectedProperty->getLevel());
         $this->assertEquals('Ladybug\Tests\Type\Object\Bar', $protectedProperty->getOwner());
 
         $this->assertInstanceOf('Ladybug\Type\Object\Property', $publicProperty);
         $this->assertEquals('publicProperty', $publicProperty->getName());
         $this->assertEquals(VisibilityInterface::VISIBILITY_PUBLIC, $publicProperty->getVisibility());
-        $this->assertInstanceOf('Ladybug\Type\Int', $publicProperty->getValue());
+        $this->assertInstanceOf('Ladybug\Type\IntType', $publicProperty->getValue());
         $this->assertEquals(2, $publicProperty->getLevel());
         $this->assertEquals('Ladybug\Tests\Type\Object\Bar', $publicProperty->getOwner());
 
         // constants
         $this->assertEquals(1, count($this->type->getClassConstants()));
         $constant = $this->type->getConstantByName('CONSTANT');
         $this->assertEquals('CONSTANT', $constant->getName());
-        $this->assertInstanceOf('Ladybug\Type\Int', $constant->getValue());
+        $this->assertInstanceOf('Ladybug\Type\IntType', $constant->getValue());
         $this->assertEquals(2, $constant->getLevel());
 
         // methods
@@ -138,7 +138,7 @@ public function testLoaderForValidValues()
 
         $this->assertEquals('p5', $parameter5->getName());
         $this->assertFalse($parameter5->isReference());
-        $this->assertInstanceOf('Ladybug\Type\Int', $parameter5->getDefaultValue());
+        $this->assertInstanceOf('Ladybug\Type\IntType', $parameter5->getDefaultValue());
         $this->assertNull($parameter5->getType());
 
         // method info
diff --git a/tests/Ladybug/Tests/Type/ResourceTypeTest.php b/tests/Ladybug/Tests/Type/ResourceTypeTest.php
diff --git a/tests/Ladybug/Tests/Type/StringTypeTest.php b/tests/Ladybug/Tests/Type/StringTypeTest.php
diff --git a/tests/Ladybug/Tests/Type/Vector/ContainerTest.php b/tests/Ladybug/Tests/Type/Vector/ContainerTest.php

-Original file line number
+Diff line change
   - 5.4
   - 5.5
   - 5.6
 +  - 7.0
   - hhvm-nightly
 matrix:
Original file line number	Diff line number	Diff line change
`@@ -32,11 +32,7 @@ public function getName()`
`32`	`32`	`public function getFilters()`
`33`	`33`	`{`
`34`	`34`	`return array_merge(parent::getFilters(), array(`
`35`		`- 'tags' => new \Twig_Filter_Method(`
`36`		`- $this,`
`37`		`- 'getTags',`
`38`		`- array('is_safe' => array('html'))`
`39`		`- )`
	`35`	`+ 'tags' => new \Twig_SimpleFilter('getTags', array($this, 'getTags'), array('is_safe' => array('html'))),`
`40`	`36`	`));`
`41`	`37`	`}`
`42`	`38`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`/**`
`17`	`17`	`* Bool is an abstraction of a primitive variable of type 'bool'`
`18`	`18`	`*/`
`19`		`-class Bool extends AbstractType`
	`19`	`+class BoolType extends AbstractType`
`20`	`20`	`{`
`21`	`21`
`22`	`22`	`const TYPE_ID = 'bool';`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`use Ladybug\Inspector\InspectorManager;`
`19`	`19`	`use Ladybug\Model\VariableWrapper;`
`20`	`20`
`21`		`-class Resource extends AbstractType`
	`21`	`+class ResourceType extends AbstractType`
`22`	`22`	`{`
`23`	`23`
`24`	`24`	`const TYPE_ID = 'resource';`