Merge branch 'release/0.1.0'

matteosister · Jul 31, 2015 · 896b62c · 896b62c
2 parents dbd7398 + 3ce69e0
commit 896b62c
Show file tree

Hide file tree

Showing 44 changed files with 214 additions and 136 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 vendor
 node_modules
 bin
+phpunit.xml
diff --git a/README.md b/README.md
@@ -7,6 +7,12 @@ Patch Manager
 
 A php library to manage PATCH requests in a standardized (and elegant) way
 
+### Be careful!!!
+
+*From version 0.3 namespace will change from PatchManager\\... to Cypress\\PatchManager\\...*
+
+## Install
+
 Install with composer
 
 ``` json

diff --git a/composer.json b/composer.json
@@ -22,8 +22,8 @@
     },
     "autoload": {
         "psr-4": {
-            "PatchManager\\": "src/PatchManager/",
-            "PatchManager\\Tests\\": "tests/PatchManager/"
+            "Cypress\\PatchManager\\": "src/PatchManager/",
+            "Cypress\\PatchManager\\Tests\\": "tests/PatchManager/"
         }
     },
     "license": "LGPL-3.0+",

diff --git a/examples/data_handler.php b/examples/data_handler.php
@@ -2,12 +2,12 @@
 
 require_once __DIR__.'/../vendor/autoload.php';
 
-use PatchManager\Request\Operations;
-use PatchManager\OperationMatcher;
-use PatchManager\Handler\DataHandler;
-use PatchManager\PatchManager;
+use Cypress\PatchManager\Request\Operations;
+use Cypress\PatchManager\OperationMatcher;
+use Cypress\PatchManager\Handler\DataHandler;
+use Cypress\PatchManager\PatchManager;
 
-class Subject implements \PatchManager\Patchable
+class Subject implements \Cypress\PatchManager\Patchable
 {
     private $a = 1;
 

diff --git a/src/PatchManager/Bundle/DependencyInjection/Configuration.php b/src/PatchManager/Bundle/DependencyInjection/Configuration.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace PatchManager\Bundle\DependencyInjection;
+namespace Cypress\PatchManager\Bundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;

diff --git a/src/PatchManager/Bundle/DependencyInjection/PatchManagerCompilerPass.php b/src/PatchManager/Bundle/DependencyInjection/PatchManagerCompilerPass.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace PatchManager\Bundle\DependencyInjection;
+namespace Cypress\PatchManager\Bundle\DependencyInjection;
 
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;

diff --git a/src/PatchManager/Bundle/DependencyInjection/PatchManagerExtension.php b/src/PatchManager/Bundle/DependencyInjection/PatchManagerExtension.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace PatchManager\Bundle\DependencyInjection;
+namespace Cypress\PatchManager\Bundle\DependencyInjection;
 
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;

diff --git a/src/PatchManager/Bundle/PatchManagerBundle.php b/src/PatchManager/Bundle/PatchManagerBundle.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace PatchManager\Bundle;
+namespace Cypress\PatchManager\Bundle;
 
-use PatchManager\Bundle\DependencyInjection\PatchManagerCompilerPass;
+use Cypress\PatchManager\Bundle\DependencyInjection\PatchManagerCompilerPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 

diff --git a/src/PatchManager/Bundle/RequestAdapter/RequestStackAdapter.php b/src/PatchManager/Bundle/RequestAdapter/RequestStackAdapter.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace PatchManager\Bundle\RequestAdapter;
+namespace Cypress\PatchManager\Bundle\RequestAdapter;
 
-use PatchManager\Request\Adapter;
-use PatchManager\Request\Operations;
+use Cypress\PatchManager\Request\Adapter;
+use Cypress\PatchManager\Request\Operations;
 use Symfony\Component\HttpFoundation\RequestStack;
 
 class RequestStackAdapter implements Adapter

diff --git a/src/PatchManager/Bundle/Resources/config/handlers/data.xml b/src/PatchManager/Bundle/Resources/config/handlers/data.xml
@@ -5,6 +5,6 @@
     xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <services>
-        <service id="patch_manager.handler.data" public="false" class="PatchManager\Handler\DataHandler" />
+        <service id="patch_manager.handler.data" public="false" class="Cypress\PatchManager\Handler\DataHandler" />
     </services>
 </container>
diff --git a/src/PatchManager/Bundle/Resources/config/handlers/data_doctrine.xml b/src/PatchManager/Bundle/Resources/config/handlers/data_doctrine.xml
@@ -5,6 +5,6 @@
     xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <services>
-        <service id="patch_manager.handler.data" public="false" class="PatchManager\Handler\DataDoctrineHandler" />
+        <service id="patch_manager.handler.data" public="false" class="Cypress\PatchManager\Handler\DataDoctrineHandler" />
     </services>
 </container>
diff --git a/src/PatchManager/Bundle/Resources/config/handlers/state_machine.xml b/src/PatchManager/Bundle/Resources/config/handlers/state_machine.xml
@@ -5,7 +5,7 @@
     xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <services>
-        <service id="patch_manager.handler.state_machine" public="false" class="PatchManager\Handler\FiniteHandler">
+        <service id="patch_manager.handler.state_machine" public="false" class="Cypress\PatchManager\Handler\FiniteHandler">
             <argument type="service" id="finite.factory" />
         </service>
     </services>

diff --git a/src/PatchManager/Bundle/Resources/config/services.xml b/src/PatchManager/Bundle/Resources/config/services.xml
@@ -5,16 +5,16 @@
     xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <services>
-        <service id="patch_manager.request_adapter" class="PatchManager\Bundle\RequestAdapter\RequestStackAdapter">
+        <service id="patch_manager.request_adapter" class="Cypress\PatchManager\Bundle\RequestAdapter\RequestStackAdapter">
             <argument type="service" id="request_stack" />
         </service>
-        <service id="patch_manager.operations" public="false" class="PatchManager\Request\Operations">
+        <service id="patch_manager.operations" public="false" class="Cypress\PatchManager\Request\Operations">
             <configurator service="patch_manager.request_adapter" method="setRequestBody" />
         </service>
-        <service id="patch_manager.operation_matcher" public="false" class="PatchManager\OperationMatcher">
+        <service id="patch_manager.operation_matcher" public="false" class="Cypress\PatchManager\OperationMatcher">
             <argument type="service" id="patch_manager.operations" />
         </service>
-        <service id="patch_manager" public="true" class="PatchManager\PatchManager">
+        <service id="patch_manager" public="true" class="Cypress\PatchManager\PatchManager">
             <argument type="service" id="patch_manager.operation_matcher" />
             <argument>%patch_manager.strict_mode%</argument>
         </service>

diff --git a/src/PatchManager/Event/PatchManagerEvent.php b/src/PatchManager/Event/PatchManagerEvent.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace PatchManager\Event;
+namespace Cypress\PatchManager\Event;
 
-use PatchManager\MatchedPatchOperation;
-use PatchManager\Patchable;
+use Cypress\PatchManager\MatchedPatchOperation;
+use Cypress\PatchManager\Patchable;
 use Symfony\Component\EventDispatcher\Event;
 
 class PatchManagerEvent extends Event

diff --git a/src/PatchManager/Event/PatchManagerEvents.php b/src/PatchManager/Event/PatchManagerEvents.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace PatchManager\Event;
+namespace Cypress\PatchManager\Event;
 
 final class PatchManagerEvents
 {

diff --git a/src/PatchManager/Exception/HandlerNotFoundException.php b/src/PatchManager/Exception/HandlerNotFoundException.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace PatchManager\Exception;
+namespace Cypress\PatchManager\Exception;
 
 
 use Exception;

diff --git a/src/PatchManager/Exception/InvalidJsonRequestContent.php b/src/PatchManager/Exception/InvalidJsonRequestContent.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace PatchManager\Exception;
+namespace Cypress\PatchManager\Exception;
 
 class InvalidJsonRequestContent extends PatchManagerException
 {

diff --git a/src/PatchManager/Exception/MissingOperationNameRequest.php b/src/PatchManager/Exception/MissingOperationNameRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace PatchManager\Exception;
+namespace Cypress\PatchManager\Exception;
 
 use Exception;
 

diff --git a/src/PatchManager/Exception/MissingOperationRequest.php b/src/PatchManager/Exception/MissingOperationRequest.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace PatchManager\Exception;
+namespace Cypress\PatchManager\Exception;
 
 
 class MissingOperationRequest extends PatchManagerException

diff --git a/src/PatchManager/Exception/NonExistentOperationException.php b/src/PatchManager/Exception/NonExistentOperationException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace PatchManager\Exception;
+namespace Cypress\PatchManager\Exception;
 
 class NonExistentOperationException extends PatchManagerException
 {

diff --git a/src/PatchManager/Exception/PatchManagerException.php b/src/PatchManager/Exception/PatchManagerException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace PatchManager\Exception;
+namespace Cypress\PatchManager\Exception;
 
 class PatchManagerException extends \Exception
 {

diff --git a/src/PatchManager/Handler/DataDoctrineHandler.php b/src/PatchManager/Handler/DataDoctrineHandler.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace PatchManager\Handler;
+namespace Cypress\PatchManager\Handler;
 
 use Doctrine\ORM\EntityManagerInterface;
-use PatchManager\OperationData;
+use Cypress\PatchManager\OperationData;
 use Symfony\Component\PropertyAccess\PropertyAccessor;
 use Doctrine\Common\Persistence\Proxy;
 

diff --git a/src/PatchManager/Handler/DataHandler.php b/src/PatchManager/Handler/DataHandler.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace PatchManager\Handler;
+namespace Cypress\PatchManager\Handler;
 
-use PatchManager\OperationData;
-use PatchManager\PatchOperationHandler;
+use Cypress\PatchManager\OperationData;
+use Cypress\PatchManager\PatchOperationHandler;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\PropertyAccess\PropertyAccessor;
 
@@ -54,4 +54,15 @@ public function configureOptions(OptionsResolver $optionsResolver)
     {
         $optionsResolver->setRequired(array('property', 'value'));
     }
+
+    /**
+     * wether the handler is able to handle the given subject
+     *
+     * @param $subject
+     * @return bool
+     */
+    public function canHandle($subject)
+    {
+        return true;
+    }
 }
diff --git a/src/PatchManager/Handler/FiniteHandler.php b/src/PatchManager/Handler/FiniteHandler.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace PatchManager\Handler;
+namespace Cypress\PatchManager\Handler;
 
 use Finite\Factory\FactoryInterface;
-use PatchManager\OperationData;
-use PatchManager\PatchOperationHandler;
+use Cypress\PatchManager\OperationData;
+use Cypress\PatchManager\PatchOperationHandler;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class FiniteHandler implements PatchOperationHandler
@@ -60,4 +60,15 @@ public function configureOptions(OptionsResolver $optionsResolver)
             ->setDefined(array('check'))
             ->setDefaults(array('check' => false));
     }
+
+    /**
+     * wether the handler is able to handle the given subject
+     *
+     * @param $subject
+     * @return bool
+     */
+    public function canHandle($subject)
+    {
+        return true;
+    }
 }
diff --git a/src/PatchManager/MatchedPatchOperation.php b/src/PatchManager/MatchedPatchOperation.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace PatchManager;
+namespace Cypress\PatchManager;
 
 use Symfony\Component\OptionsResolver\OptionsResolver;
 

diff --git a/src/PatchManager/OperationData.php b/src/PatchManager/OperationData.php
@@ -1,9 +1,9 @@
 <?php
 
 
-namespace PatchManager;
+namespace Cypress\PatchManager;
 
-use PatchManager\Request\Operations;
+use Cypress\PatchManager\Request\Operations;
 use PhpCollection\Map;
 use PhpCollection\Sequence;
 

diff --git a/src/PatchManager/OperationMatcher.php b/src/PatchManager/OperationMatcher.php
@@ -1,9 +1,10 @@
 <?php
 
-namespace PatchManager;
+namespace Cypress\PatchManager;
 
-use PatchManager\Request\Operations;
+use Cypress\PatchManager\Request\Operations;
 use PhpCollection\Sequence;
+use PhpOption\Option;
 
 /**
  * Match the correct handlers based on actual operations
@@ -38,35 +39,48 @@ public function addHandler(PatchOperationHandler $handler)
     }
 
     /**
+     * @param $subject
+     *
      * @return Sequence
+     *
+     * @throws Exception\MissingOperationNameRequest
+     * @throws Exception\MissingOperationRequest
      */
-    public function getMatchedOperations()
+    public function getMatchedOperations($subject)
     {
         $handlers = $this->handlers;
         return $this->operations
             ->all()
             ->foldLeft(
                 new Sequence(),
-                function (Sequence $matchedOperations, array $operationData) use ($handlers) {
+                function (Sequence $matchedOperations, array $operationData) use ($handlers, $subject) {
+                    /** @var Option $handler */
                     $handler = $handlers->find(function (PatchOperationHandler $handler) use ($operationData) {
                         return $operationData[Operations::OP_KEY_NAME] === $handler->getName();
                     });
                     if ($handler->isDefined()) {
-                        $matchedOperations->add(MatchedPatchOperation::create($operationData, $handler->get()));
+                        /** @var PatchOperationHandler $patchOperationHandler */
+                        $patchOperationHandler = $handler->get();
+                        if ($patchOperationHandler->canHandle($subject)) {
+                            $matchedOperations->add(MatchedPatchOperation::create($operationData, $handler->get()));
+                        }
                     }
                     return $matchedOperations;
                 }
             );
     }
 
     /**
+     * @param $subject
+     *
      * @return Sequence
+     *
      * @throws Exception\MissingOperationNameRequest
      * @throws Exception\MissingOperationRequest
      */
-    public function getUnmatchedOperations()
+    public function getUnmatchedOperations($subject)
     {
-        $matchedOperations = $this->getMatchedOperations();
+        $matchedOperations = $this->getMatchedOperations($subject);
         return $this->operations
             ->all()
             ->filter(function (array $operationData) use ($matchedOperations) {