aimeos / aimeos-slim

src/Bootstrap.php

Spacing +30 added lines, -30 removed lines

@@ -27,7 +27,7 @@ 
 	 * @param \Slim\App $app Slim application
 	 * @param array $settings Multi-dimensional array of configuration settings
 	 */
-	public function __construct( \Slim\App $app, array $settings )
+	public function __construct(\Slim\App $app, array $settings)
 	{
 		$this->app = $app;
 		$this->settings = $settings;
@@ -40,16 +40,16 @@ 
 	 * @param string $path Absolute or relative path to the Aimeos route file
 	 * @return \Aimeos\Slim\Bootstrap Self instance
 	 */
-	public function routes( $path )
+	public function routes($path)
 	{
 		$app = $this->app;
 		$settings = $this->settings;
 
-		$config = function( $key, $default ) use ( $settings )
+		$config = function($key, $default) use ($settings)
 		{
-			foreach( explode( '/', trim( $key, '/' ) ) as $part )
+			foreach (explode('/', trim($key, '/')) as $part)
 			{
-				if( isset( $settings[$part] ) ) {
+				if (isset($settings[$part])) {
 					$settings = $settings[$part];
 				} else {
 					return $default;
@@ -71,52 +71,52 @@ 
 	 * @param string $extdir Absolute or relative path to the Aimeos extension directory
 	 * @return \Aimeos\Slim\Bootstrap Self instance
 	 */
-	public function setup( $extdir = '../ext' )
+	public function setup($extdir = '../ext')
 	{
 		$container = $this->app->getContainer();
 
-		$container['router'] = function( $c ) {
+		$container['router'] = function($c) {
 			return new \Aimeos\Slim\Router();
 		};
 
-		$container['aimeos'] = function( $c ) use ( $extdir ) {
-			return new \Aimeos\Bootstrap( (array) $extdir, false );
+		$container['aimeos'] = function($c) use ($extdir) {
+			return new \Aimeos\Bootstrap((array) $extdir, false);
 		};
 
-		$container['aimeos_context'] = function( $c ) {
-			return new \Aimeos\Slim\Base\Context( $c );
+		$container['aimeos_context'] = function($c) {
+			return new \Aimeos\Slim\Base\Context($c);
 		};
 
-		$container['aimeos_i18n'] = function( $c ) {
-			return new \Aimeos\Slim\Base\I18n( $c );
+		$container['aimeos_i18n'] = function($c) {
+			return new \Aimeos\Slim\Base\I18n($c);
 		};
 
-		$container['aimeos_page'] = function( $c ) {
-			return new \Aimeos\Slim\Base\Page( $c );
+		$container['aimeos_page'] = function($c) {
+			return new \Aimeos\Slim\Base\Page($c);
 		};
 
-		$container['aimeos_view'] = function( $c ) {
-			return new \Aimeos\Slim\Base\View( $c );
+		$container['aimeos_view'] = function($c) {
+			return new \Aimeos\Slim\Base\View($c);
 		};
 
 
-		$default = require __DIR__ . DIRECTORY_SEPARATOR . 'aimeos-default.php';
-		$settings = array_replace_recursive( $default, $this->settings );
+		$default = require __DIR__.DIRECTORY_SEPARATOR.'aimeos-default.php';
+		$settings = array_replace_recursive($default, $this->settings);
 
-		$container['aimeos_config'] = function( $c ) use ( $settings ) {
+		$container['aimeos_config'] = function($c) use ($settings) {
 
-			$config = new \Aimeos\MW\Config\PHPArray( $settings, $c['aimeos']->getConfigPaths() );
+			$config = new \Aimeos\MW\Config\PHPArray($settings, $c['aimeos']->getConfigPaths());
 
-			if( function_exists( 'apc_store' ) === true && $config->get( 'apc_enabled', false ) == true ) {
-				$config = new \Aimeos\MW\Config\Decorator\APC( $config, $config->get( 'apc_prefix', 'slim:' ) );
+			if (function_exists('apc_store') === true && $config->get('apc_enabled', false) == true) {
+				$config = new \Aimeos\MW\Config\Decorator\APC($config, $config->get('apc_prefix', 'slim:'));
 			}
 
 			return $config;
 		};
 
 
-		$container['mailer'] = function( $c ) {
-			return \Swift_Mailer::newInstance( \Swift_SendmailTransport::newInstance() );
+		$container['mailer'] = function($c) {
+			return \Swift_Mailer::newInstance(\Swift_SendmailTransport::newInstance());
 		};
 
 		return $this;
@@ -130,14 +130,14 @@ 
 	 */
 	public static function getVersion()
 	{
-		$basedir = dirname( dirname( dirname( dirname( __DIR__ ) ) ) ) . DIRECTORY_SEPARATOR;
+		$basedir = dirname(dirname(dirname(dirname(__DIR__)))).DIRECTORY_SEPARATOR;
 
-		if( ( $content = @file_get_contents( $basedir . 'composer.lock' ) ) !== false
-			&& ( $content = json_decode( $content, true ) ) !== null && isset( $content['packages'] )
+		if (($content = @file_get_contents($basedir.'composer.lock')) !== false
+			&& ($content = json_decode($content, true)) !== null && isset($content['packages'])
 		) {
-			foreach( (array) $content['packages'] as $item )
+			foreach ((array) $content['packages'] as $item)
 			{
-				if( $item['name'] === 'aimeos/aimeos-slim' ) {
+				if ($item['name'] === 'aimeos/aimeos-slim') {
 					return $item['version'];
 				}
 			}

src/Router.php

Indentation +58 added lines, -58 removed lines

@@ -22,68 +22,68 @@
  */
 class Router extends \Slim\Router
 {
-    /**
-     * Build the path for a named route excluding the base path
-     *
-     * @param string $name        Route name
-     * @param array  $data        Named argument replacement data
-     * @param array  $queryParams Optional query string parameters
-     *
-     * @return string
-     *
-     * @throws RuntimeException         If named route does not exist
-     * @throws InvalidArgumentException If required data not provided
-     */
-    public function relativePathFor($name, array $data = [], array $queryParams = [])
-    {
-        $route = $this->getNamedRoute($name);
-        $pattern = $route->getPattern();
+	/**
+	 * Build the path for a named route excluding the base path
+	 *
+	 * @param string $name        Route name
+	 * @param array  $data        Named argument replacement data
+	 * @param array  $queryParams Optional query string parameters
+	 *
+	 * @return string
+	 *
+	 * @throws RuntimeException         If named route does not exist
+	 * @throws InvalidArgumentException If required data not provided
+	 */
+	public function relativePathFor($name, array $data = [], array $queryParams = [])
+	{
+		$route = $this->getNamedRoute($name);
+		$pattern = $route->getPattern();
 
-        $routeDatas = $this->routeParser->parse($pattern);
-        // $routeDatas is an array of all possible routes that can be made. There is
-        // one routedata for each optional parameter plus one for no optional parameters.
-        //
-        // The most specific is last, so we look for that first.
-        $routeDatas = array_reverse($routeDatas);
+		$routeDatas = $this->routeParser->parse($pattern);
+		// $routeDatas is an array of all possible routes that can be made. There is
+		// one routedata for each optional parameter plus one for no optional parameters.
+		//
+		// The most specific is last, so we look for that first.
+		$routeDatas = array_reverse($routeDatas);
 
-        $segments = $segmentKeys = [];
-        foreach ($routeDatas as $routeData) {
-            foreach ($routeData as $item) {
-                if (is_string($item)) {
-                    // this segment is a static string
-                    $segments[] = $item;
-                    continue;
-                }
+		$segments = $segmentKeys = [];
+		foreach ($routeDatas as $routeData) {
+			foreach ($routeData as $item) {
+				if (is_string($item)) {
+					// this segment is a static string
+					$segments[] = $item;
+					continue;
+				}
 
-                // This segment has a parameter: first element is the name
-                if (!array_key_exists($item[0], $data)) {
-                    // we don't have a data element for this segment: cancel
-                    // testing this routeData item, so that we can try a less
-                    // specific routeData item.
-                    $segments = [];
-                    $segmentName = $item[0];
-                    break;
-                }
-                $segments[] = $data[$item[0]];
-                $segmentKeys[$item[0]] = true;
-            }
-            if (!empty($segments)) {
-                // we found all the parameters for this route data, no need to check
-                // less specific ones
-                break;
-            }
-        }
+				// This segment has a parameter: first element is the name
+				if (!array_key_exists($item[0], $data)) {
+					// we don't have a data element for this segment: cancel
+					// testing this routeData item, so that we can try a less
+					// specific routeData item.
+					$segments = [];
+					$segmentName = $item[0];
+					break;
+				}
+				$segments[] = $data[$item[0]];
+				$segmentKeys[$item[0]] = true;
+			}
+			if (!empty($segments)) {
+				// we found all the parameters for this route data, no need to check
+				// less specific ones
+				break;
+			}
+		}
 
-        if (empty($segments)) {
-            throw new InvalidArgumentException('Missing data for URL segment: ' . $segmentName);
-        }
-        $url = implode('', $segments);
+		if (empty($segments)) {
+			throw new InvalidArgumentException('Missing data for URL segment: ' . $segmentName);
+		}
+		$url = implode('', $segments);
 
-        $params = array_merge(array_diff_key($data, $segmentKeys), $queryParams);
-        if ($params) {
-            $url .= '?' . http_build_query($params);
-        }
+		$params = array_merge(array_diff_key($data, $segmentKeys), $queryParams);
+		if ($params) {
+			$url .= '?' . http_build_query($params);
+		}
 
-        return $url;
-    }
+		return $url;
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -75,13 +75,13 @@
         }
 
         if (empty($segments)) {
-            throw new InvalidArgumentException('Missing data for URL segment: ' . $segmentName);
+            throw new InvalidArgumentException('Missing data for URL segment: '.$segmentName);
         }
         $url = implode('', $segments);
 
         $params = array_merge(array_diff_key($data, $segmentKeys), $queryParams);
         if ($params) {
-            $url .= '?' . http_build_query($params);
+            $url .= '?'.http_build_query($params);
         }
 
         return $url;