Fixing license header, adding license file, updating namespace

Author: cryptiklemur

.gush.yml

@@ -0,0 +1,8 @@
+# Gush configuration file, any comments will be lost.
+repo_adapter: github
+issue_tracker: github
+repo_org: php-cache
+repo_name: cache-bundle
+issue_project_org: php-cache
+issue_project_name: cache-bundle
+meta-header: "This file is part of php-cache\\cache-bundle package.\n\n(c) 2015-2015 Aaron Scherer <[email protected]>\n\nThis source file is subject to the MIT license that is bundled\nwith this source code in the file LICENSE."

LICENSE

@@ -0,0 +1,22 @@
+The MIT License (MIT)
+
+Copyright (c) 2015 Aaron Scherer
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+

README.md

@@ -1,9 +1,10 @@
-Aequasi cache-bundle [![Build Status](https://travis-ci.org/aequasi/cache-bundle.png?branch=master)](https://travis-ci.org/aequasi/cache-bundle)
+PHP-Cache cache-bundle [![Build Status](https://travis-ci.org/php-cache/cache-bundle.png?branch=master)](https://travis-ci.org/php-cache/cache-bundle)
 ====================
 
 #### Cache Bundle for Symfony 2
 
-Creates services in Symfony 2, for cache, that can also be used with doctrines three cache types (metadata, result, and query). It also provides functionality for session handler support, and Router support.
+Symfony 2 library providing PSR-6 compliant cache services for the user. 
+It also lets you cache your sessions and routes.
 
 The respective cache extensions will be required for your project.
 
@@ -19,33 +20,19 @@ Redis uses the php redis extension.
 
 Run the following in your project root, assuming you have composer set up for your project
 ```sh
-composer.phar require aequasi/cache-bundle
+composer.phar require cache/cache-bundle
 ```
 
 Add the bundle to app/AppKernel.php
 
 ```php
 $bundles(
     ...
-       new Aequasi\Bundle\CacheBundle\AequasiCacheBundle(),
+       new Cache\CacheBundle\CacheBundle(),
     ...
 );
-```
-
-Then add parameters (probably in config.yml) for your servers, and options
-
-```yml
-aequasi_cache:
-    instances:
-        default:
-          persistent: true # Boolean or persistent_id
-          namespace: mc
-          type: memcached
-          hosts:
-              - { host: localhost, port: 11211 }
-```
 
-To see all the config options, run `php app/console config:dump-reference aequasi_cache` to view the config settings
+To see all the config options, run `php app/console config:dump-reference cache` to view the config settings
 
 
 #### Doctrine
@@ -55,16 +42,16 @@ This bundle allows you to use its services for Doctrine's caching methods of met
 If you want doctrine to use this as the result and query cache, add this
 
 ```yml
-aequasi_cache:
+cache:
     doctrine:
         enabled: true
         metadata:
             instance: default
-            entity_managers:   [ default ]          # the name of your entity_manager connection
+            entity_managers:   [ default ]       # the name of your entity_manager connection
             document_managers: [ default ]       # the name of your document_manager connection
         result:
             instance: default
-            entity_managers:   [ default, read ]  # you may specify multiple entity_managers
+            entity_managers:   [ default, read ] # you may specify multiple entity_managers
         query:
             instance: default
             entity_managers: [ default ]
@@ -75,7 +62,7 @@ aequasi_cache:
 This bundle even allows you to store your session data in one of your cache clusters. To enable:
 
 ```yml
-aequasi_cache:
+cache:
     session:
         enabled: true
         instance: default
@@ -88,7 +75,7 @@ aequasi_cache:
 This bundle also provides router caching, to help speed that section up. To enable:
 
 ```yml
-aequasi_cache:
+cache:
     router:
         enabled: true
         instance: default
@@ -103,15 +90,15 @@ To use this with doctrine's entity manager, just make sure you have `useResultCa
 
 ```php
 // Change default to the name of your instance
-$cache = $container->get( 'aequasi_cache.instance.default' );
+$cache = $container->get( 'cache.instance.default' );
 // Or
-$cache = $container->get( 'aequasi_cache.default' );
+$cache = $container->get( 'cache.default' );
 ```
 
 Here is an example usage of the service:
 
 ```php
-$cache = $this->get( 'aequasi_cache.instance.default' );
+$cache = $this->get( 'cache.instance.default' );
 $item = $cache->getItem('test');
 if ($item->isHit()) {
 	var_dump($item->get());
@@ -124,4 +111,4 @@ $cache->saveItem('test', $em->find('AcmeDemoBundle:User', 1), 3600);
 
 ### Need Help?
 
-Create an issue if you've found a bug, or ping me on twitter: @aequasi
+Create an issue if you've found a bug, or ping one of us on twitter: @aequasi or @TobiasNyholm

composer.json

@@ -1,34 +1,41 @@
 {
-    "name":         "aequasi/cache-bundle",
+    "name":         "cache/cache-bundle",
     "type":         "library",
-    "description":  "Creates services in Symfony 2, for cache, that can also be used with doctrines three cache types. It also provides functionality for session handler support, and Router support.",
+    "description":  "Symfony 2 library providing PSR-6 compliant cache services for the user. Many other features.",
     "keywords":     [
         "php",
         "cache",
         "redis",
-        "memcached"
+        "memcached",
+        "router",
+        "session"
     ],
-    "homepage":     "https://github.com/aequasi/cache-bundle",
-    "license":      "Apache v2",
+    "homepage":     "https://github.com/php-cache/cache-bundle",
+    "license":      "MIT",
     "authors":      [
         {
             "name":     "Aaron Scherer",
             "email":    "[email protected]",
             "homepage": "https://github.com/aequasi"
+        },
+        {
+            "name":     "Tobias Nyholm",
+            "email":    "[email protected]",
+            "homepage": "https://github.com/nyholm"
         }
     ],
     "support":      {
         "email": "[email protected]"
     },
     "require":      {
-        "php":                           "^5.5|^7",
-        "symfony/framework-bundle":      "^2.7|^3.0",
-        "doctrine/cache":                "^1.3",
-        "aequasi/psr-6-doctrine-bridge": "^1.2",
-        "psr/cache-implementation":      "~1.0"
+        "php":                      "^5.5|^7",
+        "symfony/framework-bundle": "^2.7|^3.0",
+        "psr/cache-implementation": "~1.0"
     },
     "require-dev":  {
-        "phpunit/phpunit": "^5.1|^4.0"
+        "phpunit/phpunit":      "^5.1|^4.0",
+        "cache/doctrine-cache": "dev-master@dev",
+        "psr/cache":            "dev-master"
     },
     "repositories": [
         {
@@ -42,12 +49,12 @@
     },
     "autoload":     {
         "psr-4": {
-            "Aequasi\\Bundle\\CacheBundle\\": "src/"
+            "Cache\\CacheBundle\\": "src/"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "Aequasi\\Bundle\\CacheBundle\\Tests\\": "tests/"
+            "Cache\\CacheBundle\\Tests\\": "tests/"
         }
     }
 }

src/Cache/LoggingCachePool.php

@@ -1,15 +1,15 @@
 <?php
 
-/**
- * This file is part of cache-bundle
+/*
+ * This file is part of php-cache\cache-bundle package.
  *
- * (c) Aaron Scherer <[email protected]>
+ * (c) 2015-2015 Aaron Scherer <[email protected]>
  *
- * This source file is subject to the license that is bundled
- * with this source code in the file LICENSE
+ * This source file is subject to the MIT license that is bundled
+ * with this source code in the file LICENSE.
  */
 
-namespace Aequasi\Bundle\CacheBundle\Cache;
+namespace Cache\CacheBundle\Cache;
 
 use Aequasi\Cache\CacheItem;
 use Aequasi\Cache\CachePool;

src/Cache/Memcached.php

@@ -1,23 +1,26 @@
 <?php
 
-/**
- * @author    Aaron Scherer <[email protected]>
- * @date      2013
- * @license   http://www.apache.org/licenses/LICENSE-2.0.html Apache License, Version 2.0
+/*
+ * This file is part of php-cache\cache-bundle package.
+ *
+ * (c) 2015-2015 Aaron Scherer <[email protected]>
+ *
+ * This source file is subject to the MIT license that is bundled
+ * with this source code in the file LICENSE.
  */
 
-namespace Aequasi\Bundle\CacheBundle;
+namespace Cache\CacheBundle;
 
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Aequasi\Bundle\CacheBundle\DependencyInjection\Compiler;
+use Cache\CacheBundle\DependencyInjection\Compiler;
 
 /**
  * Class AequasiCacheBundle
  *
  * @author Aaron Scherer <[email protected]>
  */
-class AequasiCacheBundle extends Bundle
+class CacheBundle extends Bundle
 {
     /**
      * {@inheritDoc}

src/AequasiCacheBundle.php src/CacheBundle.phpsrc/AequasiCacheBundle.php renamed to src/CacheBundle.php

@@ -1,12 +1,15 @@
 <?php
 
-/**
- * @author    Aaron Scherer
- * @date      12/10/13
- * @license   http://www.apache.org/licenses/LICENSE-2.0.html Apache License, Version 2.0
+/*
+ * This file is part of php-cache\cache-bundle package.
+ *
+ * (c) 2015-2015 Aaron Scherer <[email protected]>
+ *
+ * This source file is subject to the MIT license that is bundled
+ * with this source code in the file LICENSE.
  */
 
-namespace Aequasi\Bundle\CacheBundle\Command;
+namespace Cache\CacheBundle\Command;
 
 use Psr\Cache\CacheItemPoolInterface;
 use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;

src/Command/CacheFlushCommand.php

@@ -1,15 +1,18 @@
 <?php
 
-/**
- * @author    Aaron Scherer
- * @date      12/9/13
- * @license   http://www.apache.org/licenses/LICENSE-2.0.html Apache License, Version 2.0
+/*
+ * This file is part of php-cache\cache-bundle package.
+ *
+ * (c) 2015-2015 Aaron Scherer <[email protected]>
+ *
+ * This source file is subject to the MIT license that is bundled
+ * with this source code in the file LICENSE.
  */
 
-namespace Aequasi\Bundle\CacheBundle\DataCollector;
+namespace Cache\CacheBundle\DataCollector;
 
-use Aequasi\Bundle\CacheBundle\Cache\LoggingCachePool;
-use Aequasi\Bundle\CacheBundle\Service\CacheService;
+use Cache\CacheBundle\Cache\LoggingCachePool;
+use Cache\CacheBundle\Service\CacheService;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\DataCollector\DataCollector;

src/DataCollector/CacheDataCollector.php

@@ -1,12 +1,15 @@
 <?php
 
-/**
- * @author    Aaron Scherer
- * @date      12/6/13
- * @license   http://www.apache.org/licenses/LICENSE-2.0.html Apache License, Version 2.0
+/*
+ * This file is part of php-cache\cache-bundle package.
+ *
+ * (c) 2015-2015 Aaron Scherer <[email protected]>
+ *
+ * This source file is subject to the MIT license that is bundled
+ * with this source code in the file LICENSE.
  */
 
-namespace Aequasi\Bundle\CacheBundle\DependencyInjection\Builder;
+namespace Cache\CacheBundle\DependencyInjection\Builder;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;