ppi / framework

src/Debug/ExceptionHandler.php

Spacing +1 added lines, -1 removed lines

@@ -367,7 +367,7 @@
                 $formattedValue = sprintf("<em>object</em>(%s)", $this->abbrClass($item[1]));
             } elseif ('array' === $item[0]) {
                 $formattedValue = sprintf("<em>array</em>(%s)", is_array($item[1]) ? $this->formatArgs($item[1]) : $item[1]);
-            } elseif ('string'  === $item[0]) {
+            } elseif ('string' === $item[0]) {
                 $formattedValue = sprintf("'%s'", htmlspecialchars($item[1], ENT_QUOTES | ENT_SUBSTITUTE, $this->charset));
             } elseif ('null' === $item[0]) {
                 $formattedValue = '<em>null</em>';

src/Http/Stream.php

Spacing +16 added lines, -16 removed lines

@@ -67,7 +67,7 @@ 
      */
     public function __toString()
     {
-        if (! $this->isReadable()) {
+        if (!$this->isReadable()) {
             return '';
         }
 
@@ -79,7 +79,7 @@ 
      */
     public function close()
     {
-        if (! $this->resource) {
+        if (!$this->resource) {
             return;
         }
 
@@ -116,8 +116,8 @@ 
     public function attach($resource, $mode = 'r')
     {
         $error = null;
-        if (! is_resource($resource) && is_string($resource)) {
-            set_error_handler(function ($e) use (&$error) {
+        if (!is_resource($resource) && is_string($resource)) {
+            set_error_handler(function($e) use (&$error) {
                 $error = $e;
             }, E_WARNING);
             $resource = fopen($resource, $mode);
@@ -128,7 +128,7 @@ 
             throw new InvalidArgumentException('Invalid stream reference provided');
         }
 
-        if (! is_resource($resource)) {
+        if (!is_resource($resource)) {
             throw new InvalidArgumentException(
                 'Invalid stream provided; must be a string stream identifier or resource'
             );
@@ -160,7 +160,7 @@ 
      */
     public function tell()
     {
-        if (! $this->resource) {
+        if (!$this->resource) {
             return false;
         }
 
@@ -174,7 +174,7 @@ 
      */
     public function eof()
     {
-        if (! $this->resource) {
+        if (!$this->resource) {
             return true;
         }
 
@@ -188,7 +188,7 @@ 
      */
     public function isSeekable()
     {
-        if (! $this->resource) {
+        if (!$this->resource) {
             return false;
         }
 
@@ -214,7 +214,7 @@ 
      */
     public function seek($offset, $whence = SEEK_SET)
     {
-        if (! $this->resource || ! $this->isSeekable()) {
+        if (!$this->resource || !$this->isSeekable()) {
             return false;
         }
 
@@ -230,7 +230,7 @@ 
      */
     public function rewind()
     {
-        if (! $this->isSeekable()) {
+        if (!$this->isSeekable()) {
             return false;
         }
 
@@ -246,7 +246,7 @@ 
      */
     public function isWritable()
     {
-        if (! $this->resource) {
+        if (!$this->resource) {
             return false;
         }
 
@@ -265,7 +265,7 @@ 
      */
     public function write($string)
     {
-        if (! $this->resource) {
+        if (!$this->resource) {
             return false;
         }
 
@@ -279,7 +279,7 @@ 
      */
     public function isReadable()
     {
-        if (! $this->resource) {
+        if (!$this->resource) {
             return false;
         }
 
@@ -302,7 +302,7 @@ 
      */
     public function read($length)
     {
-        if (! $this->resource || ! $this->isReadable()) {
+        if (!$this->resource || !$this->isReadable()) {
             return false;
         }
 
@@ -320,7 +320,7 @@ 
      */
     public function getContents()
     {
-        if (! $this->isReadable()) {
+        if (!$this->isReadable()) {
             return '';
         }
 
@@ -341,7 +341,7 @@ 
         }
 
         $metadata = stream_get_meta_data($this->resource);
-        if (! array_key_exists($key, $metadata)) {
+        if (!array_key_exists($key, $metadata)) {
             return;
         }
 

src/Http/Uri.php

Spacing +21 added lines, -21 removed lines

@@ -109,18 +109,18 @@ 
      */
     public function __construct($uri = '')
     {
-        if (! is_string($uri)) {
+        if (!is_string($uri)) {
             throw new InvalidArgumentException(sprintf(
                 'URI passed to constructor must be a string; received "%s"',
                 (is_object($uri) ? get_class($uri) : gettype($uri))
             ));
         }
 
-        $this->urlEncode = function (array $matches) {
+        $this->urlEncode = function(array $matches) {
             return rawurlencode($matches[0]);
         };
 
-        if (! empty($uri)) {
+        if (!empty($uri)) {
             $this->parseUri($uri);
         }
     }
@@ -210,7 +210,7 @@ 
         }
 
         $authority = $this->host;
-        if (! empty($this->userInfo)) {
+        if (!empty($this->userInfo)) {
             $authority = $this->userInfo . '@' . $authority;
         }
 
@@ -436,7 +436,7 @@ 
      */
     public function withPort($port)
     {
-        if (! (is_integer($port) || (is_string($port) && is_numeric($port)))) {
+        if (!(is_integer($port) || (is_string($port) && is_numeric($port)))) {
             throw new InvalidArgumentException(sprintf(
                 'Invalid port "%s" specified; must be an integer or integer string',
                 (is_object($port) ? get_class($port) : gettype($port))
@@ -482,7 +482,7 @@ 
      */
     public function withPath($path)
     {
-        if (! is_string($path)) {
+        if (!is_string($path)) {
             throw new InvalidArgumentException(
                 'Invalid path provided; must be a string'
             );
@@ -533,7 +533,7 @@ 
      */
     public function withQuery($query)
     {
-        if (! is_string($query)) {
+        if (!is_string($query)) {
             throw new InvalidArgumentException(
                 'Query string must be a string'
             );
@@ -594,12 +594,12 @@ 
     {
         $parts = parse_url($uri);
 
-        $this->scheme    = isset($parts['scheme'])   ? $this->filterScheme($parts['scheme']) : '';
-        $this->userInfo  = isset($parts['user'])     ? $parts['user']     : '';
-        $this->host      = isset($parts['host'])     ? $parts['host']     : '';
-        $this->port      = isset($parts['port'])     ? $parts['port']     : null;
-        $this->path      = isset($parts['path'])     ? $this->filterPath($parts['path']) : '';
-        $this->query     = isset($parts['query'])    ? $this->filterQuery($parts['query']) : '';
+        $this->scheme    = isset($parts['scheme']) ? $this->filterScheme($parts['scheme']) : '';
+        $this->userInfo  = isset($parts['user']) ? $parts['user'] : '';
+        $this->host      = isset($parts['host']) ? $parts['host'] : '';
+        $this->port      = isset($parts['port']) ? $parts['port'] : null;
+        $this->path      = isset($parts['path']) ? $this->filterPath($parts['path']) : '';
+        $this->query     = isset($parts['query']) ? $this->filterQuery($parts['query']) : '';
         $this->fragment  = isset($parts['fragment']) ? $this->filterFragment($parts['fragment']) : '';
 
         if (isset($parts['pass'])) {
@@ -622,11 +622,11 @@ 
     {
         $uri = '';
 
-        if (! empty($scheme)) {
+        if (!empty($scheme)) {
             $uri .= sprintf('%s://', $scheme);
         }
 
-        if (! empty($authority)) {
+        if (!empty($authority)) {
             $uri .= $authority;
         }
 
@@ -656,15 +656,15 @@ 
      */
     private function isNonStandardPort($scheme, $host, $port)
     {
-        if (! $scheme) {
+        if (!$scheme) {
             return true;
         }
 
-        if (! $host || ! $port) {
+        if (!$host || !$port) {
             return false;
         }
 
-        return ! isset($this->allowedSchemes[$scheme]) || $port !== $this->allowedSchemes[$scheme];
+        return !isset($this->allowedSchemes[$scheme]) || $port !== $this->allowedSchemes[$scheme];
     }
 
     /**
@@ -683,7 +683,7 @@ 
             return '';
         }
 
-        if (! array_key_exists($scheme, $this->allowedSchemes)) {
+        if (!array_key_exists($scheme, $this->allowedSchemes)) {
             throw new InvalidArgumentException(sprintf(
                 'Unsupported scheme "%s"; must be any empty string or in the set (%s)',
                 $scheme,
@@ -728,7 +728,7 @@ 
      */
     private function filterQuery($query)
     {
-        if (! empty($query) && strpos($query, '?') === 0) {
+        if (!empty($query) && strpos($query, '?') === 0) {
             $query = substr($query, 1);
         }
 
@@ -779,7 +779,7 @@ 
             $fragment = '';
         }
 
-        if (! empty($fragment) && strpos($fragment, '#') === 0) {
+        if (!empty($fragment) && strpos($fragment, '#') === 0) {
             $fragment = substr($fragment, 1);
         }
 

src/ServiceManager/Config/MonologConfig.php

Spacing +2 added lines, -2 removed lines

@@ -81,7 +81,7 @@ 
         }
 
         $loggerClass = $configs['parameters']['monolog.logger.class'];
-        $serviceManager->setFactory('monolog.logger', function ($serviceManager) use ($loggerClass, $handlersToChannels) {
+        $serviceManager->setFactory('monolog.logger', function($serviceManager) use ($loggerClass, $handlersToChannels) {
             $logger = new $loggerClass('app');
             foreach ($handlersToChannels as $handler => $channels) {
                 $logger->pushHandler($serviceManager->get($handler));
@@ -105,7 +105,7 @@ 
         $class            = $parameters[sprintf('monolog.handler.%s.class', $handler['type'])];
         $handler['level'] = is_int($handler['level']) ? $handler['level'] : constant('Monolog\Logger::' . strtoupper($handler['level']));
 
-        $serviceManager->setFactory($handlerId, function ($serviceManager) use ($class, $handler) {
+        $serviceManager->setFactory($handlerId, function($serviceManager) use ($class, $handler) {
             switch ($handler['type']) {
             case 'stream':
                 return new $class($handler['path'], $handler['level'], $handler['bubble']);

src/ServiceManager/Config/ServiceManagerConfig.php

Spacing +3 added lines, -3 removed lines

@@ -133,7 +133,7 @@ 
             $serviceManager->setShared($name, $value);
         }
 
-        $serviceManager->addInitializer(function ($instance) use ($serviceManager) {
+        $serviceManager->addInitializer(function($instance) use ($serviceManager) {
             if ($instance instanceof EventManagerAwareInterface) {
                 if ($instance->getEventManager() instanceof EventManagerInterface) {
                     $instance->getEventManager()->setSharedManager(
@@ -145,13 +145,13 @@ 
             }
         });
 
-        $serviceManager->addInitializer(function ($instance) use ($serviceManager) {
+        $serviceManager->addInitializer(function($instance) use ($serviceManager) {
             if ($instance instanceof ServiceManagerAwareInterface) {
                 $instance->setServiceManager($serviceManager);
             }
         });
 
-        $serviceManager->addInitializer(function ($instance) use ($serviceManager) {
+        $serviceManager->addInitializer(function($instance) use ($serviceManager) {
             if ($instance instanceof ServiceLocatorAwareInterface) {
                 $instance->setServiceLocator($serviceManager);
             }

src/ServiceManager/Config/SessionConfig.php

Spacing +7 added lines, -7 removed lines

@@ -45,7 +45,7 @@ 
 
         $config = $serviceManager->get('Config');
 
-        $options =  array_merge(array(
+        $options = array_merge(array(
             'auto_start'        => false,
             'storage_id'        => 'session.storage.native',
             'handler_id'        => 'session.handler.native_file',
@@ -67,14 +67,14 @@ 
         }
 
         // session handler
-        $serviceManager->setFactory('session.handler', function ($serviceManager) use ($options) {
+        $serviceManager->setFactory('session.handler', function($serviceManager) use ($options) {
             $handlerID = $options['handler_id'];
 
             return $handlerID === null ? null : $serviceManager->get($handlerID);
         });
 
         // session storage native
-        $serviceManager->setFactory('session.storage.native', function ($serviceManager) use ($storageOptions) {
+        $serviceManager->setFactory('session.storage.native', function($serviceManager) use ($storageOptions) {
 
             // We need to strip out keys with a null value so symfony doesn't try and set things with a blank value
             $storageOptions = array_filter($storageOptions);
@@ -83,19 +83,19 @@ 
         });
 
         // session flash bag
-        $serviceManager->setFactory('session.flash_bag', function ($serviceManager) {
+        $serviceManager->setFactory('session.flash_bag', function($serviceManager) {
             return new FlashBag();
         });
 
         // session attribute bag
-        $serviceManager->setFactory('session.attribute_bag', function ($serviceManager) {
+        $serviceManager->setFactory('session.attribute_bag', function($serviceManager) {
             return new AttributeBag();
         });
 
         $that = $this;
 
         // session handler native file
-        $serviceManager->setFactory('session.handler.native_file', function ($serviceManager) use ($that, $storageOptions) {
+        $serviceManager->setFactory('session.handler.native_file', function($serviceManager) use ($that, $storageOptions) {
 
             // We want absolute paths if we can
             if (null !== $storageOptions['save_path'] && !$that->isAbsolutePath($storageOptions['save_path'])) {
@@ -112,7 +112,7 @@ 
         });
 
         // session
-        $serviceManager->setFactory('session', function ($serviceManager) {
+        $serviceManager->setFactory('session', function($serviceManager) {
 
             $session = new Session(
                 $serviceManager->get('session.storage.native'),

src/ServiceManager/Config/TemplatingConfig.php

Spacing +10 added lines, -10 removed lines

@@ -75,7 +75,7 @@ 
         /*
          * Templating Locator.
          */
-        $serviceManager->setFactory('templating.locator', function ($serviceManager) use ($appCacheDir) {
+        $serviceManager->setFactory('templating.locator', function($serviceManager) use ($appCacheDir) {
             return new TemplateLocator(
                 $serviceManager->get('file_locator'),
                 $appCacheDir
@@ -85,28 +85,28 @@ 
         /*
          * Templating Name Parser.
          */
-        $serviceManager->setFactory('templating.name_parser', function ($serviceManager) {
+        $serviceManager->setFactory('templating.name_parser', function($serviceManager) {
             return new TemplateNameParser($serviceManager->get('modulemanager'));
         });
 
         /*
          * Filesystem Loader.
          */
-        $serviceManager->setFactory('templating.loader.filesystem', function ($serviceManager) {
+        $serviceManager->setFactory('templating.loader.filesystem', function($serviceManager) {
             return new FileSystemLoader($serviceManager->get('templating.locator'));
         });
 
         /*
          * Templating assets helper.
          */
-        $serviceManager->setFactory('templating.helper.assets', function ($serviceManager) {
+        $serviceManager->setFactory('templating.helper.assets', function($serviceManager) {
             return new AssetsHelper($serviceManager->get('request')->getBasePath());
         });
 
         /*
          * Templating globals.
          */
-        $serviceManager->setFactory('templating.globals', function ($serviceManager) {
+        $serviceManager->setFactory('templating.globals', function($serviceManager) {
             return new GlobalVariables($serviceManager->get('servicemanager'));
         });
 
@@ -115,7 +115,7 @@ 
          *
          * TODO: Migrate to Symfony\Bundle\FrameworkBundle\Templating\PhpEngine
          */
-        $serviceManager->setFactory('templating.engine.php', function ($serviceManager) use ($appCharset) {
+        $serviceManager->setFactory('templating.engine.php', function($serviceManager) use ($appCharset) {
             $engine = new PhpEngine(
                 $serviceManager->get('templating.name_parser'),
                 $serviceManager->get('templating.loader'),
@@ -136,7 +136,7 @@ 
         /*
          * Twig Engine
          */
-        $serviceManager->setFactory('templating.engine.twig', function ($serviceManager) {
+        $serviceManager->setFactory('templating.engine.twig', function($serviceManager) {
 
             if (!class_exists('Twig_Environment')) {
                 throw new \Exception('PPI\Framework\TwigModule not found. Composer require: ppi/twig-module');
@@ -159,7 +159,7 @@ 
         /*
          * Smarty Engine.
          */
-        $serviceManager->setFactory('templating.engine.smarty', function ($serviceManager) use ($appCacheDir) {
+        $serviceManager->setFactory('templating.engine.smarty', function($serviceManager) use ($appCacheDir) {
 
             if (!class_exists('NoiseLabs\Bundle\SmartyBundle\SmartyEngine')) {
                 throw new \Exception('PPI\Framework\SmartyModule not found. Composer require: ppi/smarty-module');
@@ -188,7 +188,7 @@ 
         });
 
         // Mustache Engine
-        $serviceManager->setFactory('templating.engine.mustache', function ($serviceManager, $appCacheDir) {
+        $serviceManager->setFactory('templating.engine.mustache', function($serviceManager, $appCacheDir) {
 
             if (!class_exists('Mustache_Engine')) {
                 throw new \Exception('PPI\Framework\MustacheModule not found. Composer require: ppi/mustache-module');
@@ -206,7 +206,7 @@ 
         /*
          * Delegating Engine.
          */
-        $serviceManager->setFactory('templating.engine.delegating', function ($serviceManager) use ($engineIds) {
+        $serviceManager->setFactory('templating.engine.delegating', function($serviceManager) use ($engineIds) {
             $delegatingEngine = new DelegatingEngine();
             // @todo - lazy load this
             foreach ($engineIds as $id) {

src/ServiceManager/Factory/ConfigFactory.php

Spacing +1 added lines, -2 removed lines

@@ -48,8 +48,7 @@
         $parametersBag = $serviceLocator->get('ApplicationParameters');
 
         $config['parameters'] = isset($config['parameters']) ?
-            ArrayUtils::merge($parametersBag->all(), $config['parameters']) :
-            $config['parameters'] = $parametersBag->all();
+            ArrayUtils::merge($parametersBag->all(), $config['parameters']) : $config['parameters'] = $parametersBag->all();
 
         return $parametersBag->resolveArray($config);
     }

src/ServiceManager/Factory/RouterRequestContextFactory.php

Spacing +1 added lines, -2 removed lines

@@ -61,7 +61,6 @@
         $defaults = $defaults['framework']['router'];
 
         return isset($config['framework']['router']) ?
-            $this->mergeConfiguration($defaults, $config['framework']['router']) :
-            $defaults;
+            $this->mergeConfiguration($defaults, $config['framework']['router']) : $defaults;
     }
 }