@@ -367,7 +367,7 @@ |
||
| 367 | 367 | $formattedValue = sprintf("<em>object</em>(%s)", $this->abbrClass($item[1])); |
| 368 | 368 | } elseif ('array' === $item[0]) { |
| 369 | 369 | $formattedValue = sprintf("<em>array</em>(%s)", is_array($item[1]) ? $this->formatArgs($item[1]) : $item[1]); |
| 370 | - } elseif ('string' === $item[0]) { |
|
| 370 | + } elseif ('string' === $item[0]) { |
|
| 371 | 371 | $formattedValue = sprintf("'%s'", htmlspecialchars($item[1], ENT_QUOTES | ENT_SUBSTITUTE, $this->charset)); |
| 372 | 372 | } elseif ('null' === $item[0]) { |
| 373 | 373 | $formattedValue = '<em>null</em>'; |
@@ -67,7 +67,7 @@ discard block |
||
| 67 | 67 | */ |
| 68 | 68 | public function __toString() |
| 69 | 69 | { |
| 70 | - if (! $this->isReadable()) { |
|
| 70 | + if (!$this->isReadable()) { |
|
| 71 | 71 | return ''; |
| 72 | 72 | } |
| 73 | 73 | |
@@ -79,7 +79,7 @@ discard block |
||
| 79 | 79 | */ |
| 80 | 80 | public function close() |
| 81 | 81 | { |
| 82 | - if (! $this->resource) { |
|
| 82 | + if (!$this->resource) { |
|
| 83 | 83 | return; |
| 84 | 84 | } |
| 85 | 85 | |
@@ -116,8 +116,8 @@ discard block |
||
| 116 | 116 | public function attach($resource, $mode = 'r') |
| 117 | 117 | { |
| 118 | 118 | $error = null; |
| 119 | - if (! is_resource($resource) && is_string($resource)) { |
|
| 120 | - set_error_handler(function ($e) use (&$error) { |
|
| 119 | + if (!is_resource($resource) && is_string($resource)) { |
|
| 120 | + set_error_handler(function($e) use (&$error) { |
|
| 121 | 121 | $error = $e; |
| 122 | 122 | }, E_WARNING); |
| 123 | 123 | $resource = fopen($resource, $mode); |
@@ -128,7 +128,7 @@ discard block |
||
| 128 | 128 | throw new InvalidArgumentException('Invalid stream reference provided'); |
| 129 | 129 | } |
| 130 | 130 | |
| 131 | - if (! is_resource($resource)) { |
|
| 131 | + if (!is_resource($resource)) { |
|
| 132 | 132 | throw new InvalidArgumentException( |
| 133 | 133 | 'Invalid stream provided; must be a string stream identifier or resource' |
| 134 | 134 | ); |
@@ -160,7 +160,7 @@ discard block |
||
| 160 | 160 | */ |
| 161 | 161 | public function tell() |
| 162 | 162 | { |
| 163 | - if (! $this->resource) { |
|
| 163 | + if (!$this->resource) { |
|
| 164 | 164 | return false; |
| 165 | 165 | } |
| 166 | 166 | |
@@ -174,7 +174,7 @@ discard block |
||
| 174 | 174 | */ |
| 175 | 175 | public function eof() |
| 176 | 176 | { |
| 177 | - if (! $this->resource) { |
|
| 177 | + if (!$this->resource) { |
|
| 178 | 178 | return true; |
| 179 | 179 | } |
| 180 | 180 | |
@@ -188,7 +188,7 @@ discard block |
||
| 188 | 188 | */ |
| 189 | 189 | public function isSeekable() |
| 190 | 190 | { |
| 191 | - if (! $this->resource) { |
|
| 191 | + if (!$this->resource) { |
|
| 192 | 192 | return false; |
| 193 | 193 | } |
| 194 | 194 | |
@@ -214,7 +214,7 @@ discard block |
||
| 214 | 214 | */ |
| 215 | 215 | public function seek($offset, $whence = SEEK_SET) |
| 216 | 216 | { |
| 217 | - if (! $this->resource || ! $this->isSeekable()) { |
|
| 217 | + if (!$this->resource || !$this->isSeekable()) { |
|
| 218 | 218 | return false; |
| 219 | 219 | } |
| 220 | 220 | |
@@ -230,7 +230,7 @@ discard block |
||
| 230 | 230 | */ |
| 231 | 231 | public function rewind() |
| 232 | 232 | { |
| 233 | - if (! $this->isSeekable()) { |
|
| 233 | + if (!$this->isSeekable()) { |
|
| 234 | 234 | return false; |
| 235 | 235 | } |
| 236 | 236 | |
@@ -246,7 +246,7 @@ discard block |
||
| 246 | 246 | */ |
| 247 | 247 | public function isWritable() |
| 248 | 248 | { |
| 249 | - if (! $this->resource) { |
|
| 249 | + if (!$this->resource) { |
|
| 250 | 250 | return false; |
| 251 | 251 | } |
| 252 | 252 | |
@@ -265,7 +265,7 @@ discard block |
||
| 265 | 265 | */ |
| 266 | 266 | public function write($string) |
| 267 | 267 | { |
| 268 | - if (! $this->resource) { |
|
| 268 | + if (!$this->resource) { |
|
| 269 | 269 | return false; |
| 270 | 270 | } |
| 271 | 271 | |
@@ -279,7 +279,7 @@ discard block |
||
| 279 | 279 | */ |
| 280 | 280 | public function isReadable() |
| 281 | 281 | { |
| 282 | - if (! $this->resource) { |
|
| 282 | + if (!$this->resource) { |
|
| 283 | 283 | return false; |
| 284 | 284 | } |
| 285 | 285 | |
@@ -302,7 +302,7 @@ discard block |
||
| 302 | 302 | */ |
| 303 | 303 | public function read($length) |
| 304 | 304 | { |
| 305 | - if (! $this->resource || ! $this->isReadable()) { |
|
| 305 | + if (!$this->resource || !$this->isReadable()) { |
|
| 306 | 306 | return false; |
| 307 | 307 | } |
| 308 | 308 | |
@@ -320,7 +320,7 @@ discard block |
||
| 320 | 320 | */ |
| 321 | 321 | public function getContents() |
| 322 | 322 | { |
| 323 | - if (! $this->isReadable()) { |
|
| 323 | + if (!$this->isReadable()) { |
|
| 324 | 324 | return ''; |
| 325 | 325 | } |
| 326 | 326 | |
@@ -341,7 +341,7 @@ discard block |
||
| 341 | 341 | } |
| 342 | 342 | |
| 343 | 343 | $metadata = stream_get_meta_data($this->resource); |
| 344 | - if (! array_key_exists($key, $metadata)) { |
|
| 344 | + if (!array_key_exists($key, $metadata)) { |
|
| 345 | 345 | return; |
| 346 | 346 | } |
| 347 | 347 | |
@@ -81,7 +81,7 @@ discard block |
||
| 81 | 81 | } |
| 82 | 82 | |
| 83 | 83 | $loggerClass = $configs['parameters']['monolog.logger.class']; |
| 84 | - $serviceManager->setFactory('monolog.logger', function ($serviceManager) use ($loggerClass, $handlersToChannels) { |
|
| 84 | + $serviceManager->setFactory('monolog.logger', function($serviceManager) use ($loggerClass, $handlersToChannels) { |
|
| 85 | 85 | $logger = new $loggerClass('app'); |
| 86 | 86 | foreach ($handlersToChannels as $handler => $channels) { |
| 87 | 87 | $logger->pushHandler($serviceManager->get($handler)); |
@@ -105,7 +105,7 @@ discard block |
||
| 105 | 105 | $class = $parameters[sprintf('monolog.handler.%s.class', $handler['type'])]; |
| 106 | 106 | $handler['level'] = is_int($handler['level']) ? $handler['level'] : constant('Monolog\Logger::' . strtoupper($handler['level'])); |
| 107 | 107 | |
| 108 | - $serviceManager->setFactory($handlerId, function ($serviceManager) use ($class, $handler) { |
|
| 108 | + $serviceManager->setFactory($handlerId, function($serviceManager) use ($class, $handler) { |
|
| 109 | 109 | switch ($handler['type']) { |
| 110 | 110 | case 'stream': |
| 111 | 111 | return new $class($handler['path'], $handler['level'], $handler['bubble']); |
@@ -133,7 +133,7 @@ discard block |
||
| 133 | 133 | $serviceManager->setShared($name, $value); |
| 134 | 134 | } |
| 135 | 135 | |
| 136 | - $serviceManager->addInitializer(function ($instance) use ($serviceManager) { |
|
| 136 | + $serviceManager->addInitializer(function($instance) use ($serviceManager) { |
|
| 137 | 137 | if ($instance instanceof EventManagerAwareInterface) { |
| 138 | 138 | if ($instance->getEventManager() instanceof EventManagerInterface) { |
| 139 | 139 | $instance->getEventManager()->setSharedManager( |
@@ -145,13 +145,13 @@ discard block |
||
| 145 | 145 | } |
| 146 | 146 | }); |
| 147 | 147 | |
| 148 | - $serviceManager->addInitializer(function ($instance) use ($serviceManager) { |
|
| 148 | + $serviceManager->addInitializer(function($instance) use ($serviceManager) { |
|
| 149 | 149 | if ($instance instanceof ServiceManagerAwareInterface) { |
| 150 | 150 | $instance->setServiceManager($serviceManager); |
| 151 | 151 | } |
| 152 | 152 | }); |
| 153 | 153 | |
| 154 | - $serviceManager->addInitializer(function ($instance) use ($serviceManager) { |
|
| 154 | + $serviceManager->addInitializer(function($instance) use ($serviceManager) { |
|
| 155 | 155 | if ($instance instanceof ServiceLocatorAwareInterface) { |
| 156 | 156 | $instance->setServiceLocator($serviceManager); |
| 157 | 157 | } |
@@ -45,7 +45,7 @@ discard block |
||
| 45 | 45 | |
| 46 | 46 | $config = $serviceManager->get('Config'); |
| 47 | 47 | |
| 48 | - $options = array_merge(array( |
|
| 48 | + $options = array_merge(array( |
|
| 49 | 49 | 'auto_start' => false, |
| 50 | 50 | 'storage_id' => 'session.storage.native', |
| 51 | 51 | 'handler_id' => 'session.handler.native_file', |
@@ -67,14 +67,14 @@ discard block |
||
| 67 | 67 | } |
| 68 | 68 | |
| 69 | 69 | // session handler |
| 70 | - $serviceManager->setFactory('session.handler', function ($serviceManager) use ($options) { |
|
| 70 | + $serviceManager->setFactory('session.handler', function($serviceManager) use ($options) { |
|
| 71 | 71 | $handlerID = $options['handler_id']; |
| 72 | 72 | |
| 73 | 73 | return $handlerID === null ? null : $serviceManager->get($handlerID); |
| 74 | 74 | }); |
| 75 | 75 | |
| 76 | 76 | // session storage native |
| 77 | - $serviceManager->setFactory('session.storage.native', function ($serviceManager) use ($storageOptions) { |
|
| 77 | + $serviceManager->setFactory('session.storage.native', function($serviceManager) use ($storageOptions) { |
|
| 78 | 78 | |
| 79 | 79 | // We need to strip out keys with a null value so symfony doesn't try and set things with a blank value |
| 80 | 80 | $storageOptions = array_filter($storageOptions); |
@@ -83,19 +83,19 @@ discard block |
||
| 83 | 83 | }); |
| 84 | 84 | |
| 85 | 85 | // session flash bag |
| 86 | - $serviceManager->setFactory('session.flash_bag', function ($serviceManager) { |
|
| 86 | + $serviceManager->setFactory('session.flash_bag', function($serviceManager) { |
|
| 87 | 87 | return new FlashBag(); |
| 88 | 88 | }); |
| 89 | 89 | |
| 90 | 90 | // session attribute bag |
| 91 | - $serviceManager->setFactory('session.attribute_bag', function ($serviceManager) { |
|
| 91 | + $serviceManager->setFactory('session.attribute_bag', function($serviceManager) { |
|
| 92 | 92 | return new AttributeBag(); |
| 93 | 93 | }); |
| 94 | 94 | |
| 95 | 95 | $that = $this; |
| 96 | 96 | |
| 97 | 97 | // session handler native file |
| 98 | - $serviceManager->setFactory('session.handler.native_file', function ($serviceManager) use ($that, $storageOptions) { |
|
| 98 | + $serviceManager->setFactory('session.handler.native_file', function($serviceManager) use ($that, $storageOptions) { |
|
| 99 | 99 | |
| 100 | 100 | // We want absolute paths if we can |
| 101 | 101 | if (null !== $storageOptions['save_path'] && !$that->isAbsolutePath($storageOptions['save_path'])) { |
@@ -112,7 +112,7 @@ discard block |
||
| 112 | 112 | }); |
| 113 | 113 | |
| 114 | 114 | // session |
| 115 | - $serviceManager->setFactory('session', function ($serviceManager) { |
|
| 115 | + $serviceManager->setFactory('session', function($serviceManager) { |
|
| 116 | 116 | |
| 117 | 117 | $session = new Session( |
| 118 | 118 | $serviceManager->get('session.storage.native'), |
@@ -75,7 +75,7 @@ discard block |
||
| 75 | 75 | /* |
| 76 | 76 | * Templating Locator. |
| 77 | 77 | */ |
| 78 | - $serviceManager->setFactory('templating.locator', function ($serviceManager) use ($appCacheDir) { |
|
| 78 | + $serviceManager->setFactory('templating.locator', function($serviceManager) use ($appCacheDir) { |
|
| 79 | 79 | return new TemplateLocator( |
| 80 | 80 | $serviceManager->get('file_locator'), |
| 81 | 81 | $appCacheDir |
@@ -85,28 +85,28 @@ discard block |
||
| 85 | 85 | /* |
| 86 | 86 | * Templating Name Parser. |
| 87 | 87 | */ |
| 88 | - $serviceManager->setFactory('templating.name_parser', function ($serviceManager) { |
|
| 88 | + $serviceManager->setFactory('templating.name_parser', function($serviceManager) { |
|
| 89 | 89 | return new TemplateNameParser($serviceManager->get('modulemanager')); |
| 90 | 90 | }); |
| 91 | 91 | |
| 92 | 92 | /* |
| 93 | 93 | * Filesystem Loader. |
| 94 | 94 | */ |
| 95 | - $serviceManager->setFactory('templating.loader.filesystem', function ($serviceManager) { |
|
| 95 | + $serviceManager->setFactory('templating.loader.filesystem', function($serviceManager) { |
|
| 96 | 96 | return new FileSystemLoader($serviceManager->get('templating.locator')); |
| 97 | 97 | }); |
| 98 | 98 | |
| 99 | 99 | /* |
| 100 | 100 | * Templating assets helper. |
| 101 | 101 | */ |
| 102 | - $serviceManager->setFactory('templating.helper.assets', function ($serviceManager) { |
|
| 102 | + $serviceManager->setFactory('templating.helper.assets', function($serviceManager) { |
|
| 103 | 103 | return new AssetsHelper($serviceManager->get('request')->getBasePath()); |
| 104 | 104 | }); |
| 105 | 105 | |
| 106 | 106 | /* |
| 107 | 107 | * Templating globals. |
| 108 | 108 | */ |
| 109 | - $serviceManager->setFactory('templating.globals', function ($serviceManager) { |
|
| 109 | + $serviceManager->setFactory('templating.globals', function($serviceManager) { |
|
| 110 | 110 | return new GlobalVariables($serviceManager->get('servicemanager')); |
| 111 | 111 | }); |
| 112 | 112 | |
@@ -115,7 +115,7 @@ discard block |
||
| 115 | 115 | * |
| 116 | 116 | * TODO: Migrate to Symfony\Bundle\FrameworkBundle\Templating\PhpEngine |
| 117 | 117 | */ |
| 118 | - $serviceManager->setFactory('templating.engine.php', function ($serviceManager) use ($appCharset) { |
|
| 118 | + $serviceManager->setFactory('templating.engine.php', function($serviceManager) use ($appCharset) { |
|
| 119 | 119 | $engine = new PhpEngine( |
| 120 | 120 | $serviceManager->get('templating.name_parser'), |
| 121 | 121 | $serviceManager->get('templating.loader'), |
@@ -136,7 +136,7 @@ discard block |
||
| 136 | 136 | /* |
| 137 | 137 | * Twig Engine |
| 138 | 138 | */ |
| 139 | - $serviceManager->setFactory('templating.engine.twig', function ($serviceManager) { |
|
| 139 | + $serviceManager->setFactory('templating.engine.twig', function($serviceManager) { |
|
| 140 | 140 | |
| 141 | 141 | if (!class_exists('Twig_Environment')) { |
| 142 | 142 | throw new \Exception('PPI\Framework\TwigModule not found. Composer require: ppi/twig-module'); |
@@ -159,7 +159,7 @@ discard block |
||
| 159 | 159 | /* |
| 160 | 160 | * Smarty Engine. |
| 161 | 161 | */ |
| 162 | - $serviceManager->setFactory('templating.engine.smarty', function ($serviceManager) use ($appCacheDir) { |
|
| 162 | + $serviceManager->setFactory('templating.engine.smarty', function($serviceManager) use ($appCacheDir) { |
|
| 163 | 163 | |
| 164 | 164 | if (!class_exists('NoiseLabs\Bundle\SmartyBundle\SmartyEngine')) { |
| 165 | 165 | throw new \Exception('PPI\Framework\SmartyModule not found. Composer require: ppi/smarty-module'); |
@@ -188,7 +188,7 @@ discard block |
||
| 188 | 188 | }); |
| 189 | 189 | |
| 190 | 190 | // Mustache Engine |
| 191 | - $serviceManager->setFactory('templating.engine.mustache', function ($serviceManager, $appCacheDir) { |
|
| 191 | + $serviceManager->setFactory('templating.engine.mustache', function($serviceManager, $appCacheDir) { |
|
| 192 | 192 | |
| 193 | 193 | if (!class_exists('Mustache_Engine')) { |
| 194 | 194 | throw new \Exception('PPI\Framework\MustacheModule not found. Composer require: ppi/mustache-module'); |
@@ -206,7 +206,7 @@ discard block |
||
| 206 | 206 | /* |
| 207 | 207 | * Delegating Engine. |
| 208 | 208 | */ |
| 209 | - $serviceManager->setFactory('templating.engine.delegating', function ($serviceManager) use ($engineIds) { |
|
| 209 | + $serviceManager->setFactory('templating.engine.delegating', function($serviceManager) use ($engineIds) { |
|
| 210 | 210 | $delegatingEngine = new DelegatingEngine(); |
| 211 | 211 | // @todo - lazy load this |
| 212 | 212 | foreach ($engineIds as $id) { |
@@ -48,8 +48,7 @@ |
||
| 48 | 48 | $parametersBag = $serviceLocator->get('ApplicationParameters'); |
| 49 | 49 | |
| 50 | 50 | $config['parameters'] = isset($config['parameters']) ? |
| 51 | - ArrayUtils::merge($parametersBag->all(), $config['parameters']) : |
|
| 52 | - $config['parameters'] = $parametersBag->all(); |
|
| 51 | + ArrayUtils::merge($parametersBag->all(), $config['parameters']) : $config['parameters'] = $parametersBag->all(); |
|
| 53 | 52 | |
| 54 | 53 | return $parametersBag->resolveArray($config); |
| 55 | 54 | } |
@@ -61,7 +61,6 @@ |
||
| 61 | 61 | $defaults = $defaults['framework']['router']; |
| 62 | 62 | |
| 63 | 63 | return isset($config['framework']['router']) ? |
| 64 | - $this->mergeConfiguration($defaults, $config['framework']['router']) : |
|
| 65 | - $defaults; |
|
| 64 | + $this->mergeConfiguration($defaults, $config['framework']['router']) : $defaults; |
|
| 66 | 65 | } |
| 67 | 66 | } |
@@ -80,7 +80,7 @@ |
||
| 80 | 80 | public function resolveArray(array $data) |
| 81 | 81 | { |
| 82 | 82 | $self = $this; |
| 83 | - array_walk_recursive($data, function (&$value, $key) use ($self) { |
|
| 83 | + array_walk_recursive($data, function(&$value, $key) use ($self) { |
|
| 84 | 84 | if (is_string($value)) { |
| 85 | 85 | $value = $self->resolveString($value); |
| 86 | 86 | } |