Additional cs fixes

Signed-off-by: Graham Campbell <graham@cachethq.io>
illuminate · Jun 1, 2015 · abc8d75 · abc8d75
1 parent e626f51
commit abc8d75
Show file tree

Hide file tree

Showing 14 changed files with 72 additions and 44 deletions.
diff --git a/CacheBasedSessionHandler.php b/CacheBasedSessionHandler.php
@@ -1,4 +1,6 @@
-<?php namespace Illuminate\Session;
+<?php
+
+namespace Illuminate\Session;
 
 use SessionHandlerInterface;
 use Illuminate\Contracts\Cache\Repository as CacheContract;

diff --git a/CommandsServiceProvider.php b/CommandsServiceProvider.php
@@ -1,4 +1,6 @@
-<?php namespace Illuminate\Session;
+<?php
+
+namespace Illuminate\Session;
 
 use Illuminate\Support\ServiceProvider;
 use Illuminate\Session\Console\SessionTableCommand;
@@ -33,6 +35,6 @@ public function register()
      */
     public function provides()
     {
-        return array('command.session.database');
+        return ['command.session.database'];
     }
 }
diff --git a/Console/SessionTableCommand.php b/Console/SessionTableCommand.php
@@ -1,4 +1,6 @@
-<?php namespace Illuminate\Session\Console;
+<?php
+
+namespace Illuminate\Session\Console;
 
 use Illuminate\Console\Command;
 use Illuminate\Foundation\Composer;

diff --git a/CookieSessionHandler.php b/CookieSessionHandler.php
@@ -1,4 +1,6 @@
-<?php namespace Illuminate\Session;
+<?php
+
+namespace Illuminate\Session;
 
 use SessionHandlerInterface;
 use Symfony\Component\HttpFoundation\Request;

diff --git a/DatabaseSessionHandler.php b/DatabaseSessionHandler.php
@@ -1,4 +1,6 @@
-<?php namespace Illuminate\Session;
+<?php
+
+namespace Illuminate\Session;
 
 use SessionHandlerInterface;
 use Illuminate\Database\ConnectionInterface;

diff --git a/EncryptedStore.php b/EncryptedStore.php
@@ -1,4 +1,6 @@
-<?php namespace Illuminate\Session;
+<?php
+
+namespace Illuminate\Session;
 
 use SessionHandlerInterface;
 use Illuminate\Contracts\Encryption\DecryptException;

diff --git a/ExistenceAwareInterface.php b/ExistenceAwareInterface.php
@@ -1,4 +1,6 @@
-<?php namespace Illuminate\Session;
+<?php
+
+namespace Illuminate\Session;
 
 interface ExistenceAwareInterface
 {

diff --git a/FileSessionHandler.php b/FileSessionHandler.php
@@ -1,4 +1,6 @@
-<?php namespace Illuminate\Session;
+<?php
+
+namespace Illuminate\Session;
 
 use SessionHandlerInterface;
 use Symfony\Component\Finder\Finder;

diff --git a/Middleware/StartSession.php b/Middleware/StartSession.php
@@ -1,4 +1,6 @@
-<?php namespace Illuminate\Session\Middleware;
+<?php
+
+namespace Illuminate\Session\Middleware;
 
 use Closure;
 use Carbon\Carbon;
@@ -82,7 +84,7 @@ public function handle($request, Closure $next)
      */
     public function terminate($request, $response)
     {
-        if ($this->sessionHandled && $this->sessionConfigured() && ! $this->usingCookieSessions()) {
+        if ($this->sessionHandled && $this->sessionConfigured() && !$this->usingCookieSessions()) {
             $this->manager->driver()->save();
         }
     }
@@ -126,7 +128,7 @@ public function getSession(Request $request)
      */
     protected function storeCurrentUrl(Request $request, $session)
     {
-        if ($request->method() === 'GET' && $request->route() && ! $request->ajax()) {
+        if ($request->method() === 'GET' && $request->route() && !$request->ajax()) {
             $session->setPreviousUrl($request->fullUrl());
         }
     }
@@ -210,7 +212,7 @@ protected function getCookieExpirationDate()
      */
     protected function sessionConfigured()
     {
-        return ! is_null(array_get($this->manager->getSessionConfig(), 'driver'));
+        return !is_null(array_get($this->manager->getSessionConfig(), 'driver'));
     }
 
     /**
@@ -223,7 +225,7 @@ protected function sessionIsPersistent(array $config = null)
     {
         $config = $config ?: $this->manager->getSessionConfig();
 
-        return ! in_array($config['driver'], array(null, 'array'));
+        return !in_array($config['driver'], [null, 'array']);
     }
 
     /**
@@ -233,7 +235,7 @@ protected function sessionIsPersistent(array $config = null)
      */
     protected function usingCookieSessions()
     {
-        if (! $this->sessionConfigured()) {
+        if (!$this->sessionConfigured()) {
             return false;
         }
 

diff --git a/SessionInterface.php b/SessionInterface.php
@@ -1,4 +1,6 @@
-<?php namespace Illuminate\Session;
+<?php
+
+namespace Illuminate\Session;
 
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Session\SessionInterface as BaseSessionInterface;

diff --git a/SessionManager.php b/SessionManager.php
@@ -1,4 +1,6 @@
-<?php namespace Illuminate\Session;
+<?php
+
+namespace Illuminate\Session;
 
 use Illuminate\Support\Manager;
 use Symfony\Component\HttpFoundation\Session\Storage\Handler\NullSessionHandler;

diff --git a/SessionServiceProvider.php b/SessionServiceProvider.php
@@ -1,4 +1,6 @@
-<?php namespace Illuminate\Session;
+<?php
+
+namespace Illuminate\Session;
 
 use Illuminate\Support\ServiceProvider;
 

diff --git a/Store.php b/Store.php
@@ -1,4 +1,6 @@
-<?php namespace Illuminate\Session;
+<?php
+
+namespace Illuminate\Session;
 
 use SessionHandlerInterface;
 use InvalidArgumentException;
@@ -27,14 +29,14 @@ class Store implements SessionInterface
      *
      * @var array
      */
-    protected $attributes = array();
+    protected $attributes = [];
 
     /**
      * The session bags.
      *
      * @var array
      */
-    protected $bags = array();
+    protected $bags = [];
 
     /**
      * The meta-data bag instance.
@@ -48,7 +50,7 @@ class Store implements SessionInterface
      *
      * @var array
      */
-    protected $bagData = array();
+    protected $bagData = [];
 
     /**
      * The session handler implementation.
@@ -87,7 +89,7 @@ public function start()
     {
         $this->loadSession();
 
-        if (! $this->has('_token')) {
+        if (!$this->has('_token')) {
             $this->regenerateToken();
         }
 
@@ -103,7 +105,7 @@ protected function loadSession()
     {
         $this->attributes = array_merge($this->attributes, $this->readFromHandler());
 
-        foreach (array_merge($this->bags, array($this->metaBag)) as $bag) {
+        foreach (array_merge($this->bags, [$this->metaBag]) as $bag) {
             $this->initializeLocalBag($bag);
 
             $bag->initialize($this->bagData[$bag->getStorageKey()]);
@@ -165,7 +167,7 @@ public function getId()
      */
     public function setId($id)
     {
-        if (! $this->isValidId($id)) {
+        if (!$this->isValidId($id)) {
             $id = $this->generateSessionId();
         }
 
@@ -278,7 +280,7 @@ protected function prepareForStorage($data)
      */
     protected function addBagDataToSession()
     {
-        foreach (array_merge($this->bags, array($this->metaBag)) as $bag) {
+        foreach (array_merge($this->bags, [$this->metaBag]) as $bag) {
             $this->put($bag->getStorageKey(), $this->bagData[$bag->getStorageKey()]);
         }
     }
@@ -290,21 +292,21 @@ protected function addBagDataToSession()
      */
     public function ageFlashData()
     {
-        foreach ($this->get('flash.old', array()) as $old) {
+        foreach ($this->get('flash.old', []) as $old) {
             $this->forget($old);
         }
 
-        $this->put('flash.old', $this->get('flash.new', array()));
+        $this->put('flash.old', $this->get('flash.new', []));
 
-        $this->put('flash.new', array());
+        $this->put('flash.new', []);
     }
 
     /**
      * {@inheritdoc}
      */
     public function has($name)
     {
-        return ! is_null($this->get($name));
+        return !is_null($this->get($name));
     }
 
     /**
@@ -337,7 +339,7 @@ public function hasOldInput($key = null)
     {
         $old = $this->getOldInput($key);
 
-        return is_null($key) ? count($old) > 0 : ! is_null($old);
+        return is_null($key) ? count($old) > 0 : !is_null($old);
     }
 
     /**
@@ -349,7 +351,7 @@ public function hasOldInput($key = null)
      */
     public function getOldInput($key = null, $default = null)
     {
-        $input = $this->get('_old_input', array());
+        $input = $this->get('_old_input', []);
 
         // Input that is flashed to the session can be easily retrieved by the
         // developer, making repopulating old forms and the like much more
@@ -374,8 +376,8 @@ public function set($name, $value)
      */
     public function put($key, $value = null)
     {
-        if (! is_array($key)) {
-            $key = array($key => $value);
+        if (!is_array($key)) {
+            $key = [$key => $value];
         }
 
         foreach ($key as $arrayKey => $arrayValue) {
@@ -392,7 +394,7 @@ public function put($key, $value = null)
      */
     public function push($key, $value)
     {
-        $array = $this->get($key, array());
+        $array = $this->get($key, []);
 
         $array[] = $value;
 
@@ -412,7 +414,7 @@ public function flash($key, $value)
 
         $this->push('flash.new', $key);
 
-        $this->removeFromOldFlashData(array($key));
+        $this->removeFromOldFlashData([$key]);
     }
 
     /**
@@ -433,9 +435,9 @@ public function flashInput(array $value)
      */
     public function reflash()
     {
-        $this->mergeNewFlashes($this->get('flash.old', array()));
+        $this->mergeNewFlashes($this->get('flash.old', []));
 
-        $this->put('flash.old', array());
+        $this->put('flash.old', []);
     }
 
     /**
@@ -461,7 +463,7 @@ public function keep($keys = null)
      */
     protected function mergeNewFlashes(array $keys)
     {
-        $values = array_unique(array_merge($this->get('flash.new', array()), $keys));
+        $values = array_unique(array_merge($this->get('flash.new', []), $keys));
 
         $this->put('flash.new', $values);
     }
@@ -474,7 +476,7 @@ protected function mergeNewFlashes(array $keys)
      */
     protected function removeFromOldFlashData(array $keys)
     {
-        $this->put('flash.old', array_diff($this->get('flash.old', array()), $keys));
+        $this->put('flash.old', array_diff($this->get('flash.old', []), $keys));
     }
 
     /**
@@ -517,7 +519,7 @@ public function forget($key)
      */
     public function clear()
     {
-        $this->attributes = array();
+        $this->attributes = [];
 
         foreach ($this->bags as $bag) {
             $bag->clear();
@@ -556,7 +558,7 @@ public function registerBag(SessionBagInterface $bag)
     public function getBag($name)
     {
         return array_get($this->bags, $name, function () {
-            throw new InvalidArgumentException("Bag not registered.");
+            throw new InvalidArgumentException('Bag not registered.');
         });
     }
 
@@ -576,7 +578,7 @@ public function getMetadataBag()
      */
     public function getBagData($name)
     {
-        return array_get($this->bagData, $name, array());
+        return array_get($this->bagData, $name, []);
     }
 
     /**

diff --git a/TokenMismatchException.php b/TokenMismatchException.php
@@ -1,4 +1,6 @@
-<?php namespace Illuminate\Session;
+<?php
+
+namespace Illuminate\Session;
 
 use Exception;