From a36cd4a223a829ec7b76ee537c7dec7c55f3991a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20Gallego?= <mic.gallego@gmail.com>
Date: Sat, 18 Jan 2014 19:08:01 +0100
Subject: [PATCH] Remove factory

---
 CHANGELOG.md                               |  5 +++
 composer.json                              |  3 --
 src/Rbac/Factory/RbacFactory.php           | 46 ----------------------
 tests/RbacTest/Factory/RbacFactoryTest.php | 39 ------------------
 4 files changed, 5 insertions(+), 88 deletions(-)
 delete mode 100644 src/Rbac/Factory/RbacFactory.php
 delete mode 100644 tests/RbacTest/Factory/RbacFactoryTest.php

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ac2628e..40d77f0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 1.1.0
+
+* [BC] Remove factory. It was not intend to be here but rather on ZfcRbac. This way this component is completely
+framework agnostic
+
 ## 1.0.0
 
 * Initial release
diff --git a/composer.json b/composer.json
index f6cf4d6..f2e0460 100644
--- a/composer.json
+++ b/composer.json
@@ -26,9 +26,6 @@
         "squizlabs/php_codesniffer": "1.4.*",
         "satooshi/php-coveralls": "~0.6"
     },
-    "suggest": {
-        "zendframework/zend-servicemanager": "If you want to use RBAC factory"
-    },
     "autoload": {
         "psr-0": {
             "Rbac\\": "src/"
diff --git a/src/Rbac/Factory/RbacFactory.php b/src/Rbac/Factory/RbacFactory.php
deleted file mode 100644
index f766f63..0000000
--- a/src/Rbac/Factory/RbacFactory.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/*
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the MIT license.
- */
-
-namespace Rbac\Factory;
-
-use Rbac\Rbac;
-use Rbac\Traversal\Strategy\GeneratorStrategy;
-use Rbac\Traversal\Strategy\RecursiveRoleIteratorStrategy;
-use Zend\ServiceManager\FactoryInterface;
-use Zend\ServiceManager\ServiceLocatorInterface;
-
-/**
- * @author  Michaël Gallego <mic.gallego@gmail.com>
- * @licence MIT
- */
-class RbacFactory implements FactoryInterface
-{
-    /**
-     * {@inheritDoc}
-     */
-    public function createService(ServiceLocatorInterface $serviceLocator)
-    {
-        if (version_compare(PHP_VERSION, '5.5.0', '>=')) {
-            $traversalStrategy = new GeneratorStrategy();
-        } else {
-            $traversalStrategy = new RecursiveRoleIteratorStrategy();
-        }
-
-        return new Rbac($traversalStrategy);
-    }
-}
diff --git a/tests/RbacTest/Factory/RbacFactoryTest.php b/tests/RbacTest/Factory/RbacFactoryTest.php
deleted file mode 100644
index be20159..0000000
--- a/tests/RbacTest/Factory/RbacFactoryTest.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/*
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the MIT license.
- */
-
-namespace RbacTest\Factory;
-use Rbac\Factory\RbacFactory;
-use Zend\ServiceManager\ServiceManager;
-
-/**
- * @covers Rbac\Factory\RbacFactory
- * @group  Coverage
- */
-class RbacFactoryTest extends \PHPUnit_Framework_TestCase
-{
-    public function testCanCreateFromFactory()
-    {
-        $serviceManager = new ServiceManager();
-        $factory        = new RbacFactory();
-
-        $rbac = $factory->createService($serviceManager);
-
-        $this->assertInstanceOf('Rbac\Rbac', $rbac);
-        $this->assertInstanceOf('Rbac\Traversal\Strategy\TraversalStrategyInterface', $rbac->getTraversalStrategy());
-    }
-}