Merge branch 'develop'

.gitignore

@@ -2,3 +2,4 @@ vendor
 target
 .idea
 composer.lock
+.DS_Store

.travis.yml

@@ -1,8 +1,11 @@
 language: php
 php:
+  - 5.2
   - 5.3
   - 5.4
+  - 5.5
 before_script:
-  - wget http://getcomposer.org/composer.phar
-  - php composer.phar install --dev
+  - wget https://raw.github.com/ehough/throwback/develop/src/main/bash/travis-setup.sh
+  - chmod a+x travis-setup.sh
+  - ./travis-setup.sh
 script: "phpunit -c src/test/resources/phpunit.xml"

README.md

@@ -1,28 +1,31 @@
-chaingang [![Build Status](https://secure.travis-ci.org/ehough/chaingang.png)](http://travis-ci.org/ehough/chaingang)
-=====
+# chaingang [![Build Status](https://secure.travis-ci.org/ehough/chaingang.png)](http://travis-ci.org/ehough/chaingang)
 
-[Chain-of-Responsibility pattern](http://en.wikipedia.org/wiki/Chain-of-responsibility_pattern) in PHP.
+[Chain-of-Responsibility/Chain-of-Command pattern](http://en.wikipedia.org/wiki/Chain-of-responsibility_pattern) for PHP 5.2+
 
-    /*
-     * Build some commands.
-     */
-    $command1 = new MyCommand1();   //implements ehough_chaingang_api_Command
-    $command2 = new MyCommand2();   //implements ehough_chaingang_api_Command
+### Sample Usage
 
-    /*
-     * Build and assemble the chain.
-     */
-    $chain = new ehough_chaingang_impl_StandardChain();
-    $chain->addCommand($command1);
-    $chain->addCommand($command2);
+```php
+/*
+ * Build some commands.
+ */
+$command1 = new MyCommand1();   //implements ehough_chaingang_api_Command
+$command2 = new MyCommand2();   //implements ehough_chaingang_api_Command
 
-    /*
-     * Build the execution context.
-     */
-    $context = new ehough_chaingang_impl_StandardContext();
-    $context->put('foo', 'bar');
+/*
+ * Build and assemble the chain.
+ */
+$chain = new ehough_chaingang_impl_StandardChain();
+$chain->addCommand($command1);
+$chain->addCommand($command2);
 
-    /*
-     * Execute the chain.
-     */
-    $successfullyHandled = $chain->execute($context);
+/*
+ * Build the execution context.
+ */
+$context = new ehough_chaingang_impl_StandardContext();
+$context->put('foo', 'bar');
+
+/*
+ * Execute the chain.
+ */
+$successfullyHandled = $chain->execute($context);
+```

composer.json

@@ -1,36 +1,26 @@
 {
     "name": "ehough/chaingang",
-
-    "description": "Chain of Responsibility pattern in PHP.",
-
+    "description": "Chain-of-Responsibility / Chain-of-Command pattern in PHP.",
     "homepage": "https://github.com/ehough/chaingang",
-
-    "license": "GPL-3.0+",
-
+    "type": "library",
+    "license": "MPL-2.0",
     "authors": [
         {
             "name": "Eric Hough",
             "email": "[email protected]",
             "homepage": "http://ehough.com"
         }
     ],
-
     "require": {
-
-        "php": ">=5.1.0"
+        "php": ">=5.2.0"
     },
-
     "require-dev": {
-
-	    "ehough/pulsar": "1.*",
-        "mockery/mockery": ">=0.7.2"
+        "ehough/mockery": "~1.0.0"
     },
-
     "autoload": {
-
         "psr-0": {
-
             "ehough_chaingang": "src/main/php"
         }
     }
-}
+}
+

src/test/php/ehough/chaingang/impl/StandardChainTest.php

@@ -9,8 +9,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-use \Mockery as m;
-
 final class ehough_chaingang_impl_StandardChainTest extends PHPUnit_Framework_TestCase
 {
     private $_sut;
@@ -24,8 +22,8 @@ public function setUp()
 
     public function testCommandCanHandle()
     {
-        $context = m::mock('ehough_chaingang_api_Context');
-        $command = m::mock('ehough_chaingang_api_Command');
+        $context = ehough_mockery_Mockery::mock('ehough_chaingang_api_Context');
+        $command = ehough_mockery_Mockery::mock('ehough_chaingang_api_Command');
 
         $command->shouldReceive('execute')->with($context)->once()->andReturn(true);
 
@@ -38,7 +36,7 @@ public function testCommandCanHandle()
 
     public function tearDown()
     {
-        m::close();
+        ehough_mockery_Mockery::close();
     }
 
 }

src/test/php/ehough/chaingang/impl/StandardContextTest.php

@@ -9,8 +9,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-use \Mockery as m;
-
 final class ehough_chaingang_impl_StandardContextTest extends PHPUnit_Framework_TestCase
 {
     /**
@@ -77,7 +75,7 @@ public function testContextNotSet()
 
     public function tearDown()
     {
-        m::close();
+        ehough_mockery_Mockery::close();
     }
 
 }

src/test/php/throwback.php

@@ -0,0 +1,11 @@
+<?php
+
+__throwback::$config = array(
+
+    'name'         => 'ehough_chaingang',
+    'autoload'     => dirname(__FILE__) . '/../../main/php',
+    'dependencies' => array(
+
+        array('ehough/mockery', 'https://github.com/ehough/mockery.git', 'src/main/php')
+    )
+);

src/test/resources/phpunit.xml

@@ -6,7 +6,7 @@
 	stopOnSkipped="true"
 	strict="true"
     processIsolation="false"
-    bootstrap="../php/bootstrap.php">
+    bootstrap="../../../vendor/autoload.php">
 	<testsuites>
 	   <testsuite name="chaingang tests">
 	       <directory>../php/</directory>