it was created the Structural namespace and append its patterns

tonicospinelli · tonicospinelli · commit 113f63a54f8f · 2014-04-15T23:14:39.000-03:00
diff --git a/Structural/Adapter/AdapterTest.php b/Structural/Adapter/AdapterTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace DesignPatterns\Tests\Adapter;
+namespace DesignPatterns\Structural\Adapter;
 
-use DesignPatterns\Adapter\EBookAdapter;
-use DesignPatterns\Adapter\Kindle;
-use DesignPatterns\Adapter\PaperBookInterface;
-use DesignPatterns\Adapter\Book;
+use DesignPatterns\Structural\Adapter\EBookAdapter;
+use DesignPatterns\Structural\Adapter\Kindle;
+use DesignPatterns\Structural\Adapter\PaperBookInterface;
+use DesignPatterns\Structural\Adapter\Book;
 
 /**
  * AdapterTest shows the use of an adapted e-book that behave like a book
diff --git a/Structural/Adapter/Book.php b/Structural/Adapter/Book.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Adapter;
+namespace DesignPatterns\Structural\Adapter;
 
 /**
  * Book is a concrete and standard paper book
diff --git a/Structural/Adapter/EBookAdapter.php b/Structural/Adapter/EBookAdapter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Adapter;
+namespace DesignPatterns\Structural\Adapter;
 
 /**
  * EBookAdapter is an adapter to fit an e-book like a paper book
diff --git a/Structural/Adapter/EBookInterface.php b/Structural/Adapter/EBookInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Adapter;
+namespace DesignPatterns\Structural\Adapter;
 
 /**
  * EBookInterface is a contract for an electronic book
diff --git a/Structural/Adapter/Kindle.php b/Structural/Adapter/Kindle.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Adapter;
+namespace DesignPatterns\Structural\Adapter;
 
 /**
  * Kindle is a concrete electronic book
diff --git a/Structural/Adapter/PaperBookInterface.php b/Structural/Adapter/PaperBookInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Adapter;
+namespace DesignPatterns\Structural\Adapter;
 
 /**
  * PaperBookInterface is a contract for a book
diff --git a/Structural/Composite/CompositeTest.php b/Structural/Composite/CompositeTest.php
@@ -2,12 +2,12 @@
 
 namespace DesignPatterns\Test\Composite;
 
-use DesignPatterns\Composite;
+use DesignPatterns\Structural\Composite;
 
 /**
  * FormTest tests the composite pattern on Form
  */
-class FormTest extends \PHPUnit_Framework_TestCase
+class CompositeTest extends \PHPUnit_Framework_TestCase
 {
 
     public function testRender()
@@ -29,6 +29,6 @@ public function testRender()
      */
     public function testFormImplementsFormEelement()
     {
-        $this->assertTrue(is_subclass_of('DesignPatterns\Composite\Form', 'DesignPatterns\Composite\FormElement'));
+        $this->assertTrue(is_subclass_of('DesignPatterns\Structural\Composite\Form', 'DesignPatterns\Structural\Composite\FormElement'));
     }
 }
diff --git a/Structural/Composite/Form.php b/Structural/Composite/Form.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Composite;
+namespace DesignPatterns\Structural\Composite;
 
 /**
  * The composite node MUST extend the component contract. This is mandatory for building
diff --git a/Structural/Composite/FormElement.php b/Structural/Composite/FormElement.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Composite;
+namespace DesignPatterns\Structural\Composite;
 
 /**
  * Class FormElement
diff --git a/Structural/Composite/InputElement.php b/Structural/Composite/InputElement.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Composite;
+namespace DesignPatterns\Structural\Composite;
 
 /**
  * Class InputElement
diff --git a/Structural/Composite/TextElement.php b/Structural/Composite/TextElement.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Composite;
+namespace DesignPatterns\Structural\Composite;
 
 /**
  * Class TextElement
diff --git a/Structural/DataMapper/DataMapperTest.php b/Structural/DataMapper/DataMapperTest.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace DesignPatterns\Test\DataMapper;
+namespace DesignPatterns\Structural\DataMapper;
 
-use DesignPatterns\DataMapper\UserMapper;
-use DesignPatterns\DataMapper\User;
+use DesignPatterns\Structural\DataMapper\UserMapper;
+use DesignPatterns\Structural\DataMapper\User;
 
 /**
  * UserMapperTest tests the datamapper pattern
  */
-class UserMapperTest extends \PHPUnit_Framework_TestCase
+class DataMapperTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * @var UserMapper
@@ -22,7 +22,7 @@ class UserMapperTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->dbal = $this->getMockBuilder('DesignPatterns\DataMapper\DBAL')
+        $this->dbal = $this->getMockBuilder('DesignPatterns\Structural\DataMapper\DBAL')
                 ->disableAutoload()
                 ->setMethods(array('insert', 'update', 'find', 'findAll'))
                 ->getMock();
@@ -90,7 +90,7 @@ public function testRestoreMulti(User $existing)
     }
 
     /**
-     * @expectedException InvalidArgumentException
+     * @expectedException \InvalidArgumentException
      * @expectedExceptionMessage User #404 not found
      */
     public function testNotFound()
diff --git a/Structural/DataMapper/User.php b/Structural/DataMapper/User.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\DataMapper;
+namespace DesignPatterns\Structural\DataMapper;
 
 /**
  * DataMapper pattern
diff --git a/Structural/DataMapper/UserMapper.php b/Structural/DataMapper/UserMapper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\DataMapper;
+namespace DesignPatterns\Structural\DataMapper;
 
 /**
  * class UserMapper
diff --git a/Structural/Decorator/Decorator.php b/Structural/Decorator/Decorator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Decorator;
+namespace DesignPatterns\Structural\Decorator;
 
 /**
  * the Decorator MUST implement the RendererInterface contract, this is the key-feature
diff --git a/Structural/Decorator/DecoratorTest.php b/Structural/Decorator/DecoratorTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace DesignPatterns\Tests\Decorator;
+namespace DesignPatterns\Structural\Decorator;
 
-use DesignPatterns\Decorator;
+use DesignPatterns\Structural\Decorator;
 
 /**
  * DecoratorTest tests the decorator pattern
@@ -38,7 +38,7 @@ public function testXmlDecorator()
      */
     public function testDecoratorMustImplementsRenderer()
     {
-        $this->assertTrue(is_subclass_of('DesignPatterns\Decorator\Decorator', 'DesignPatterns\Decorator\RendererInterface'));
+        $this->assertTrue(is_subclass_of('DesignPatterns\Structural\Decorator\Decorator', 'DesignPatterns\Structural\Decorator\RendererInterface'));
     }
 
     /**
@@ -48,16 +48,16 @@ public function testDecoratorMustImplementsRenderer()
      */
     public function testDecoratorTypeHinted()
     {
-        $this->getMockForAbstractClass('DesignPatterns\Decorator\Decorator', array(new \stdClass()));
+        $this->getMockForAbstractClass('DesignPatterns\Structural\Decorator\Decorator', array(new \stdClass()));
     }
 
     /**
      * The decorator implements and wraps the same interface
      */
     public function testDecoratorOnlyAcceptRenderer()
     {
-        $mock = $this->getMock('DesignPatterns\Decorator\RendererInterface');
-        $dec = $this->getMockForAbstractClass('DesignPatterns\Decorator\Decorator', array($mock));
+        $mock = $this->getMock('DesignPatterns\Structural\Decorator\RendererInterface');
+        $dec = $this->getMockForAbstractClass('DesignPatterns\Structural\Decorator\Decorator', array($mock));
         $this->assertNotNull($dec);
     }
 }
diff --git a/Structural/Decorator/RenderInJson.php b/Structural/Decorator/RenderInJson.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Decorator;
+namespace DesignPatterns\Structural\Decorator;
 
 /**
  * Class RenderInJson
diff --git a/Structural/Decorator/RenderInXml.php b/Structural/Decorator/RenderInXml.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Decorator;
+namespace DesignPatterns\Structural\Decorator;
 
 /**
  * Class RenderInXml
diff --git a/Structural/Decorator/RendererInterface.php b/Structural/Decorator/RendererInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Decorator;
+namespace DesignPatterns\Structural\Decorator;
 
 /**
  * Class RendererInterface
diff --git a/Structural/Decorator/Webservice.php b/Structural/Decorator/Webservice.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Decorator;
+namespace DesignPatterns\Structural\Decorator;
 
 /**
  * Class Webservice
diff --git a/Structural/DependencyInjection/AbstractConfig.php b/Structural/DependencyInjection/AbstractConfig.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\DependencyInjection;
+namespace DesignPatterns\Structural\DependencyInjection;
 
 /**
  * class AbstractConfig
diff --git a/Structural/DependencyInjection/ArrayConfig.php b/Structural/DependencyInjection/ArrayConfig.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\DependencyInjection;
+namespace DesignPatterns\Structural\DependencyInjection;
 
 /**
  * class ArrayConfig
diff --git a/Structural/DependencyInjection/Connection.php b/Structural/DependencyInjection/Connection.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\DependencyInjection;
+namespace DesignPatterns\Structural\DependencyInjection;
 
 /**
  * Class Connection
diff --git a/Structural/DependencyInjection/DependencyInjectionTest.php b/Structural/DependencyInjection/DependencyInjectionTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace DesignPatterns\Tests\DependencyInjection;
+namespace DesignPatterns\Structural\DependencyInjection;
 
-use DesignPatterns\DependencyInjection\Parameters;
-use DesignPatterns\DependencyInjection\AbstractConfig;
-use DesignPatterns\DependencyInjection\ArrayConfig;
-use DesignPatterns\DependencyInjection\Connection;
+use DesignPatterns\Structural\DependencyInjection\Parameters;
+use DesignPatterns\Structural\DependencyInjection\AbstractConfig;
+use DesignPatterns\Structural\DependencyInjection\ArrayConfig;
+use DesignPatterns\Structural\DependencyInjection\Connection;
 
 class DependencyInjectionTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/Structural/DependencyInjection/Parameters.php b/Structural/DependencyInjection/Parameters.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\DependencyInjection;
+namespace DesignPatterns\Structural\DependencyInjection;
 
 /**
  * Parameters interface
diff --git a/Structural/DependencyInjection/config.php b/Structural/DependencyInjection/config.php
diff --git a/Structural/Facade/BiosInterface.php b/Structural/Facade/BiosInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Facade;
+namespace DesignPatterns\Structural\Facade;
 
 /**
  * Class BiosInterface
diff --git a/Structural/Facade/Facade.php b/Structural/Facade/Facade.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Facade;
+namespace DesignPatterns\Structural\Facade;
 
 /**
  *
diff --git a/Structural/Facade/FacadeTest.php b/Structural/Facade/FacadeTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace DesignPatterns\Tests\Facade;
+namespace DesignPatterns\Structural\Facade;
 
-use DesignPatterns\Facade\Facade as Computer;
+use DesignPatterns\Structural\Facade\Facade as Computer;
 
 /**
  * FacadeTest shows example of facades
@@ -12,11 +12,11 @@ class FacadeTest extends \PHPUnit_Framework_TestCase
 
     public function getComputer()
     {
-        $bios = $this->getMockBuilder('DesignPatterns\Facade\BiosInterface')
+        $bios = $this->getMockBuilder('DesignPatterns\Structural\Facade\BiosInterface')
                 ->setMethods(array('launch', 'execute', 'waitForKeyPress'))
                 ->disableAutoload()
                 ->getMock();
-        $operatingSys = $this->getMockBuilder('DesignPatterns\Facade\OsInterface')
+        $operatingSys = $this->getMockBuilder('DesignPatterns\Structural\Facade\OsInterface')
                 ->setMethods(array('getName'))
                 ->disableAutoload()
                 ->getMock();
diff --git a/Structural/Facade/OsInterface.php b/Structural/Facade/OsInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Facade;
+namespace DesignPatterns\Structural\Facade;
 
 /**
  * Class OsInterface
diff --git a/Structural/FluentInterface/FluentInterfaceTest.php b/Structural/FluentInterface/FluentInterfaceTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace DesignPatterns\Tests\FluentInterface;
+namespace DesignPatterns\Structural\FluentInterface;
 
-use DesignPatterns\FluentInterface\SQL;
+use DesignPatterns\Structural\FluentInterface\Sql;
 
 /**
  * FluentInterfaceTest tests the fluent interface SQL
@@ -12,7 +12,7 @@ class FluentInterfaceTest extends \PHPUnit_Framework_TestCase
 
     public function testBuildSQL()
     {
-        $instance = new SQL();
+        $instance = new Sql();
         $query = $instance->select(array('foo', 'bar'))
                 ->from('foobar', 'f')
                 ->where('f.bar = ?')
diff --git a/Structural/FluentInterface/SQL.php b/Structural/FluentInterface/SQL.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace DesignPatterns\FluentInterface;
+namespace DesignPatterns\Structural\FluentInterface;
 
 /**
  * class SQL
  */
-class SQL
+class Sql
 {
     /**
      * @var array
diff --git a/Structural/Proxy/Record.php b/Structural/Proxy/Record.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Proxy;
+namespace DesignPatterns\Structural\Proxy;
 
 /**
  * class Record
diff --git a/Structural/Proxy/RecordProxy.php b/Structural/Proxy/RecordProxy.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DesignPatterns\Proxy;
+namespace DesignPatterns\Structural\Proxy;
 
 /**
  * Class RecordProxy
diff --git a/Structural/Registry/Registry.php b/Structural/Registry/Registry.php
diff --git a/Structural/Registry/RegistryTest.php b/Structural/Registry/RegistryTest.php
diff --git a/Structural/Registry/index.php b/Structural/Registry/index.php

Original file line number	Diff line number	Diff line change
`@@ -2,12 +2,12 @@`
`2`	`2`
`3`	`3`	`namespace DesignPatterns\Test\Composite;`
`4`	`4`
`5`		`-use DesignPatterns\Composite;`
	`5`	`+use DesignPatterns\Structural\Composite;`
`6`	`6`
`7`	`7`	`/**`
`8`	`8`	`* FormTest tests the composite pattern on Form`
`9`	`9`	`*/`
`10`		`-class FormTest extends \PHPUnit_Framework_TestCase`
	`10`	`+class CompositeTest extends \PHPUnit_Framework_TestCase`
`11`	`11`	`{`
`12`	`12`
`13`	`13`	`public function testRender()`
`@@ -29,6 +29,6 @@ public function testRender()`
`29`	`29`	`*/`
`30`	`30`	`public function testFormImplementsFormEelement()`
`31`	`31`	`{`
`32`		`- $this->assertTrue(is_subclass_of('DesignPatterns\Composite\Form', 'DesignPatterns\Composite\FormElement'));`
	`32`	`+ $this->assertTrue(is_subclass_of('DesignPatterns\Structural\Composite\Form', 'DesignPatterns\Structural\Composite\FormElement'));`
`33`	`33`	`}`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`		`-namespace DesignPatterns\Tests\Decorator;`
	`3`	`+namespace DesignPatterns\Structural\Decorator;`
`4`	`4`
`5`		`-use DesignPatterns\Decorator;`
	`5`	`+use DesignPatterns\Structural\Decorator;`
`6`	`6`
`7`	`7`	`/**`
`8`	`8`	`* DecoratorTest tests the decorator pattern`
`@@ -38,7 +38,7 @@ public function testXmlDecorator()`
`38`	`38`	`*/`
`39`	`39`	`public function testDecoratorMustImplementsRenderer()`
`40`	`40`	`{`
`41`		`- $this->assertTrue(is_subclass_of('DesignPatterns\Decorator\Decorator', 'DesignPatterns\Decorator\RendererInterface'));`
	`41`	`+ $this->assertTrue(is_subclass_of('DesignPatterns\Structural\Decorator\Decorator', 'DesignPatterns\Structural\Decorator\RendererInterface'));`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`/**`
`@@ -48,16 +48,16 @@ public function testDecoratorMustImplementsRenderer()`
`48`	`48`	`*/`
`49`	`49`	`public function testDecoratorTypeHinted()`
`50`	`50`	`{`
`51`		`- $this->getMockForAbstractClass('DesignPatterns\Decorator\Decorator', array(new \stdClass()));`
	`51`	`+ $this->getMockForAbstractClass('DesignPatterns\Structural\Decorator\Decorator', array(new \stdClass()));`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`/**`
`55`	`55`	`* The decorator implements and wraps the same interface`
`56`	`56`	`*/`
`57`	`57`	`public function testDecoratorOnlyAcceptRenderer()`
`58`	`58`	`{`
`59`		`- $mock = $this->getMock('DesignPatterns\Decorator\RendererInterface');`
`60`		`- $dec = $this->getMockForAbstractClass('DesignPatterns\Decorator\Decorator', array($mock));`
	`59`	`+ $mock = $this->getMock('DesignPatterns\Structural\Decorator\RendererInterface');`
	`60`	`+ $dec = $this->getMockForAbstractClass('DesignPatterns\Structural\Decorator\Decorator', array($mock));`
`61`	`61`	`$this->assertNotNull($dec);`
`62`	`62`	`}`
`63`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`		`-namespace DesignPatterns\Facade;`
	`3`	`+namespace DesignPatterns\Structural\Facade;`
`4`	`4`
`5`	`5`	`/**`
`6`	`6`	`*`