Merge branch 'hotfix/cs-and-packages'

Fix CS issues and update composer definition

Author: weierophinney

.gitignore

@@ -0,0 +1,2 @@
+composer.lock
+vendor/

Module.php

@@ -41,7 +41,7 @@ public function getConfig()
 
     /**
      * Provide console usage messages for console endpoints
-     * 
+     *
      * @return array
      */
     public function getConsoleUsage()
@@ -56,9 +56,9 @@ public function getConsoleUsage()
     /**
      * Listen to the application bootstrap event
      *
-     * Registers a post-routing event. Additionally, if the 
+     * Registers a post-routing event. Additionally, if the
      * "PhlySimplePage\PageCache" service is registered, it will pull the
-     * "PhlySimplePage\PageCacheListener" service and attach it to the 
+     * "PhlySimplePage\PageCacheListener" service and attach it to the
      * event manager.
      *
      * @param  \Zend\Mvc\MvcEvent $e
@@ -137,8 +137,8 @@ public function onDispatchPost($e)
 
     /**
      * Normalize a cache key
-     * 
-     * @param  string $key 
+     *
+     * @param  string $key
      * @return string
      */
     public static function normalizeCacheKey($key)

composer.json

@@ -8,12 +8,6 @@
         "module"
     ],
     "homepage": "https://github.com/weierophinney/PhlySimplePage",
-    "repositories": [
-        {
-            "type": "composer",
-            "url": "https://packages.zendframework.com/"
-        }
-    ],
     "authors": [
         {
             "name": "Matthew Weier O'Phinney",

src/PhlySimplePage/CacheControllerService.php

@@ -18,7 +18,7 @@ class CacheControllerService implements FactoryInterface
 {
     /**
      * Create and return CacheController
-     * 
+     *
      * @param  ServiceLocatorInterface $controllers
      * @return CacheController
      * @throws Exception\ServiceNotCreatedException

src/PhlySimplePage/PageCacheListener.php

@@ -12,7 +12,7 @@
 use Zend\EventManager\ListenerAggregateInterface;
 
 /**
- * Event listener implementing page level caching for pages provided by the 
+ * Event listener implementing page level caching for pages provided by the
  * PageController.
  */
 class PageCacheListener implements ListenerAggregateInterface
@@ -29,22 +29,22 @@ class PageCacheListener implements ListenerAggregateInterface
 
     /**
      * Whether or not to cache this request
-     * 
+     *
      * @var bool
      */
     protected $cacheThisRequest = false;
 
     /**
      * Key to use when caching
-     * 
+     *
      * @var string
      */
     protected $cacheKey;
 
     /**
      * Constructor
-     * 
-     * @param AbstractAdapter $cache 
+     *
+     * @param AbstractAdapter $cache
      */
     public function __construct(AbstractAdapter $cache)
     {
@@ -56,10 +56,10 @@ public function __construct(AbstractAdapter $cache)
      *
      * Registers two event listeners:
      *
-     * - route, at priority -99, 
-     * - finish, at priority -10001, 
-     * 
-     * @param EventManagerInterface $events 
+     * - route, at priority -99,
+     * - finish, at priority -10001,
+     *
+     * @param EventManagerInterface $events
      */
     public function attach(EventManagerInterface $events)
     {
@@ -69,8 +69,8 @@ public function attach(EventManagerInterface $events)
 
     /**
      * Detach any registered listeners from the given event manager instance.
-     * 
-     * @param EventManagerInterface $events 
+     *
+     * @param EventManagerInterface $events
      */
     public function detach(EventManagerInterface $events)
     {
@@ -85,12 +85,12 @@ public function detach(EventManagerInterface $events)
      * "route" event listener
      *
      * Checks to see if (a) we have a controller we're interested in, (b) if
-     * a "template" was provided in the route matches, and (c) if we have a 
-     * cache hit for that template name. If we do, we return a populated 
+     * a "template" was provided in the route matches, and (c) if we have a
+     * cache hit for that template name. If we do, we return a populated
      * response; if not, we continue, but indicate that we should cache the
      * response on completion.
-     * 
-     * @param  \Zend\Mvc\MvcEvent $e 
+     *
+     * @param  \Zend\Mvc\MvcEvent $e
      * @return null|\Zend\Stdlib\ResponseInterface
      */
     public function onRoutePost($e)
@@ -117,7 +117,7 @@ public function onRoutePost($e)
         }
 
         $cacheKey = Module::normalizeCacheKey($template);
-        
+
         $result = $this->cache->getItem($cacheKey, $success);
         if (!$success) {
             // Not a cache hit; keep working, but indicate we should cache this
@@ -136,8 +136,8 @@ public function onRoutePost($e)
      * "finish" event listener
      *
      * Checks to see if we should cache the current request; if so, it does.
-     * 
-     * @param  \Zend\Mvc\MvcEvent $e 
+     *
+     * @param  \Zend\Mvc\MvcEvent $e
      */
     public function onFinishPost($e)
     {

src/PhlySimplePage/PageCacheListenerService.php

@@ -17,8 +17,8 @@ class PageCacheListenerService implements FactoryInterface
 {
     /**
      * Create and return page cache listener
-     * 
-     * @param  ServiceLocatorInterface $services 
+     *
+     * @param  ServiceLocatorInterface $services
      * @return PageCacheListener
      * @throws Exception\ServiceNotCreatedException
      */

src/PhlySimplePage/PageCacheService.php

@@ -19,8 +19,8 @@ class PageCacheService implements FactoryInterface
 {
     /**
      * Create and return cache storage adapter
-     * 
-     * @param  ServiceLocatorInterface $services 
+     *
+     * @param  ServiceLocatorInterface $services
      * @return \Zend\Cache\Storage\Adapter\AbstractAdapter
      * @throws Exception\ServiceNotCreatedException
      */