@@ -11,7 +11,7 @@ |
||
| 11 | 11 | |
| 12 | 12 | $collection = new RouteCollection(); |
| 13 | 13 | |
| 14 | -$route = new Route( '/{site}/lists', array( '_controller' => 'AimeosShopBundle:Catalog:list' ) ); |
|
| 15 | -$collection->add( 'catalog_list', $route ); |
|
| 14 | +$route = new Route('/{site}/lists', array('_controller' => 'AimeosShopBundle:Catalog:list')); |
|
| 15 | +$collection->add('catalog_list', $route); |
|
| 16 | 16 | |
| 17 | 17 | return $collection; |
@@ -17,14 +17,14 @@ discard block |
||
| 17 | 17 | |
| 18 | 18 | $includepaths = $mshop->getIncludePaths(); |
| 19 | 19 | $includepaths[] = get_include_path(); |
| 20 | - set_include_path( implode( PATH_SEPARATOR, $includepaths ) ); |
|
| 20 | + set_include_path(implode(PATH_SEPARATOR, $includepaths)); |
|
| 21 | 21 | } |
| 22 | 22 | |
| 23 | 23 | |
| 24 | - public static function getContext( $site = 'unittest' ) |
|
| 24 | + public static function getContext($site = 'unittest') |
|
| 25 | 25 | { |
| 26 | - if( !isset( self::$context[$site] ) ) { |
|
| 27 | - self::$context[$site] = self::createContext( $site ); |
|
| 26 | + if (!isset(self::$context[$site])) { |
|
| 27 | + self::$context[$site] = self::createContext($site); |
|
| 28 | 28 | } |
| 29 | 29 | |
| 30 | 30 | return clone self::$context[$site]; |
@@ -33,13 +33,13 @@ discard block |
||
| 33 | 33 | |
| 34 | 34 | private static function getAimeos() |
| 35 | 35 | { |
| 36 | - if( !isset( self::$aimeos ) ) |
|
| 36 | + if (!isset(self::$aimeos)) |
|
| 37 | 37 | { |
| 38 | 38 | require_once 'Bootstrap.php'; |
| 39 | - spl_autoload_register( 'Aimeos\\Bootstrap::autoload' ); |
|
| 39 | + spl_autoload_register('Aimeos\\Bootstrap::autoload'); |
|
| 40 | 40 | |
| 41 | - $extdir = dirname( dirname( dirname( __DIR__ ) ) ); |
|
| 42 | - self::$aimeos = new \Aimeos\Bootstrap( array( $extdir ), false ); |
|
| 41 | + $extdir = dirname(dirname(dirname(__DIR__))); |
|
| 42 | + self::$aimeos = new \Aimeos\Bootstrap(array($extdir), false); |
|
| 43 | 43 | } |
| 44 | 44 | |
| 45 | 45 | return self::$aimeos; |
@@ -52,37 +52,37 @@ discard block |
||
| 52 | 52 | * @param string $site Unique site code |
| 53 | 53 | * @return \\Aimeos\MShop\Context\Item\Iface Context object |
| 54 | 54 | */ |
| 55 | - private static function createContext( $site ) |
|
| 55 | + private static function createContext($site) |
|
| 56 | 56 | { |
| 57 | 57 | $ctx = new \Aimeos\MShop\Context\Item\Standard(); |
| 58 | 58 | $mshop = self::getAimeos(); |
| 59 | 59 | |
| 60 | 60 | |
| 61 | - $paths = $mshop->getConfigPaths( 'mysql' ); |
|
| 61 | + $paths = $mshop->getConfigPaths('mysql'); |
|
| 62 | 62 | $paths[] = __DIR__ . DIRECTORY_SEPARATOR . 'config'; |
| 63 | 63 | |
| 64 | - $conf = new \Aimeos\MW\Config\PHPArray( array(), $paths ); |
|
| 65 | - $ctx->setConfig( $conf ); |
|
| 64 | + $conf = new \Aimeos\MW\Config\PHPArray(array(), $paths); |
|
| 65 | + $ctx->setConfig($conf); |
|
| 66 | 66 | |
| 67 | 67 | |
| 68 | - $dbm = new \Aimeos\MW\DB\Manager\PDO( $conf ); |
|
| 69 | - $ctx->setDatabaseManager( $dbm ); |
|
| 68 | + $dbm = new \Aimeos\MW\DB\Manager\PDO($conf); |
|
| 69 | + $ctx->setDatabaseManager($dbm); |
|
| 70 | 70 | |
| 71 | 71 | |
| 72 | - $logger = new \Aimeos\MW\Logger\File( $site . '.log', \Aimeos\MW\Logger\Base::DEBUG ); |
|
| 73 | - $ctx->setLogger( $logger ); |
|
| 72 | + $logger = new \Aimeos\MW\Logger\File($site . '.log', \Aimeos\MW\Logger\Base::DEBUG); |
|
| 73 | + $ctx->setLogger($logger); |
|
| 74 | 74 | |
| 75 | 75 | |
| 76 | 76 | $session = new \Aimeos\MW\Session\None(); |
| 77 | - $ctx->setSession( $session ); |
|
| 77 | + $ctx->setSession($session); |
|
| 78 | 78 | |
| 79 | 79 | |
| 80 | - $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $ctx ); |
|
| 81 | - $localeItem = $localeManager->bootstrap( $site, '', '', false ); |
|
| 80 | + $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($ctx); |
|
| 81 | + $localeItem = $localeManager->bootstrap($site, '', '', false); |
|
| 82 | 82 | |
| 83 | - $ctx->setLocale( $localeItem ); |
|
| 83 | + $ctx->setLocale($localeItem); |
|
| 84 | 84 | |
| 85 | - $ctx->setEditor( 'ai-symfony:unittest' ); |
|
| 85 | + $ctx->setEditor('ai-symfony:unittest'); |
|
| 86 | 86 | |
| 87 | 87 | return $ctx; |
| 88 | 88 | } |
@@ -9,7 +9,7 @@ discard block |
||
| 9 | 9 | * Set error reporting to maximum |
| 10 | 10 | */ |
| 11 | 11 | error_reporting( -1 ); |
| 12 | -ini_set( 'display_errors', '1' ); |
|
| 12 | +ini_set('display_errors', '1'); |
|
| 13 | 13 | |
| 14 | 14 | date_default_timezone_set('UTC'); |
| 15 | 15 | |
@@ -17,11 +17,11 @@ discard block |
||
| 17 | 17 | /* |
| 18 | 18 | * Set locale settings to reasonable defaults |
| 19 | 19 | */ |
| 20 | -setlocale( LC_ALL, 'en_US.UTF-8' ); |
|
| 21 | -setlocale( LC_CTYPE, 'en_US.UTF-8' ); |
|
| 22 | -setlocale( LC_NUMERIC, 'POSIX' ); |
|
| 23 | -setlocale( LC_TIME, 'POSIX' ); |
|
| 24 | -date_default_timezone_set( 'UTC' ); |
|
| 20 | +setlocale(LC_ALL, 'en_US.UTF-8'); |
|
| 21 | +setlocale(LC_CTYPE, 'en_US.UTF-8'); |
|
| 22 | +setlocale(LC_NUMERIC, 'POSIX'); |
|
| 23 | +setlocale(LC_TIME, 'POSIX'); |
|
| 24 | +date_default_timezone_set('UTC'); |
|
| 25 | 25 | |
| 26 | 26 | require_once 'TestHelper.php'; |
| 27 | 27 | TestHelper::bootstrap(); |
@@ -95,8 +95,7 @@ |
||
| 95 | 95 | $value->getClientMimeType(), |
| 96 | 96 | $value->getError() |
| 97 | 97 | ); |
| 98 | - } |
|
| 99 | - elseif( is_array( $value ) ) |
|
| 98 | + } elseif( is_array( $value ) ) |
|
| 100 | 99 | { |
| 101 | 100 | $list[$key] = $this->createUploadedFiles( $value ); |
| 102 | 101 | } |
@@ -34,11 +34,11 @@ discard block |
||
| 34 | 34 | * @param \Aimeos\MW\View\Iface $view View instance with registered view helpers |
| 35 | 35 | * @param \Symfony\Component\HttpFoundation\Request $request Symfony2 request object |
| 36 | 36 | */ |
| 37 | - public function __construct( $view, \Symfony\Component\HttpFoundation\Request $request ) |
|
| 37 | + public function __construct($view, \Symfony\Component\HttpFoundation\Request $request) |
|
| 38 | 38 | { |
| 39 | 39 | $this->request = $request; |
| 40 | 40 | |
| 41 | - parent::__construct( $view, $this->createRequest( $request ) ); |
|
| 41 | + parent::__construct($view, $this->createRequest($request)); |
|
| 42 | 42 | } |
| 43 | 43 | |
| 44 | 44 | |
@@ -60,7 +60,7 @@ discard block |
||
| 60 | 60 | */ |
| 61 | 61 | public function getTarget() |
| 62 | 62 | { |
| 63 | - return $this->request->get( '_route' ); |
|
| 63 | + return $this->request->get('_route'); |
|
| 64 | 64 | } |
| 65 | 65 | |
| 66 | 66 | |
@@ -70,10 +70,10 @@ discard block |
||
| 70 | 70 | * @param \Symfony\Component\HttpFoundation\Request $nativeRequest Symfony request object |
| 71 | 71 | * @return \Psr\Http\Message\ServerRequestInterface PSR-7 request object |
| 72 | 72 | */ |
| 73 | - protected function createRequest( \Symfony\Component\HttpFoundation\Request $nativeRequest ) |
|
| 73 | + protected function createRequest(\Symfony\Component\HttpFoundation\Request $nativeRequest) |
|
| 74 | 74 | { |
| 75 | - $files = ServerRequestFactory::normalizeFiles( $this->getFiles( $nativeRequest->files->all() ) ); |
|
| 76 | - $server = ServerRequestFactory::normalizeServer( $nativeRequest->server->all() ); |
|
| 75 | + $files = ServerRequestFactory::normalizeFiles($this->getFiles($nativeRequest->files->all())); |
|
| 76 | + $server = ServerRequestFactory::normalizeServer($nativeRequest->server->all()); |
|
| 77 | 77 | $headers = $nativeRequest->headers->all(); |
| 78 | 78 | $cookies = $nativeRequest->cookies->all(); |
| 79 | 79 | $post = $nativeRequest->request->all(); |
@@ -81,13 +81,13 @@ discard block |
||
| 81 | 81 | $method = $nativeRequest->getMethod(); |
| 82 | 82 | $uri = $nativeRequest->getUri(); |
| 83 | 83 | |
| 84 | - $body = new Stream( 'php://temp', 'wb+' ); |
|
| 85 | - $body->write( $nativeRequest->getContent() ); |
|
| 84 | + $body = new Stream('php://temp', 'wb+'); |
|
| 85 | + $body->write($nativeRequest->getContent()); |
|
| 86 | 86 | |
| 87 | - $request = new ServerRequest( $server, $files, $uri, $method, $body, $headers, $cookies, $query, $post ); |
|
| 87 | + $request = new ServerRequest($server, $files, $uri, $method, $body, $headers, $cookies, $query, $post); |
|
| 88 | 88 | |
| 89 | - foreach( $nativeRequest->attributes->all() as $key => $value ) { |
|
| 90 | - $request = $request->withAttribute( $key, $value ); |
|
| 89 | + foreach ($nativeRequest->attributes->all() as $key => $value) { |
|
| 90 | + $request = $request->withAttribute($key, $value); |
|
| 91 | 91 | } |
| 92 | 92 | |
| 93 | 93 | return $request; |
@@ -100,13 +100,13 @@ discard block |
||
| 100 | 100 | * @param array $files Multi-dimensional list of uploaded files from Symfony request |
| 101 | 101 | * @return array Multi-dimensional list of uploaded files as PSR-7 objects |
| 102 | 102 | */ |
| 103 | - protected function getFiles( array $files ) |
|
| 103 | + protected function getFiles(array $files) |
|
| 104 | 104 | { |
| 105 | 105 | $list = array(); |
| 106 | 106 | |
| 107 | - foreach( $files as $key => $value ) |
|
| 107 | + foreach ($files as $key => $value) |
|
| 108 | 108 | { |
| 109 | - if( $value instanceof \Symfony\Component\HttpFoundation\File\UploadedFile ) |
|
| 109 | + if ($value instanceof \Symfony\Component\HttpFoundation\File\UploadedFile) |
|
| 110 | 110 | { |
| 111 | 111 | $list[$key] = new \Zend\Diactoros\UploadedFile( |
| 112 | 112 | $file->getRealPath(), |
@@ -116,9 +116,9 @@ discard block |
||
| 116 | 116 | $file->getClientMimeType() |
| 117 | 117 | ); |
| 118 | 118 | } |
| 119 | - elseif( is_array( $value ) ) |
|
| 119 | + elseif (is_array($value)) |
|
| 120 | 120 | { |
| 121 | - $list[$key] = $this->getFiles( $value ); |
|
| 121 | + $list[$key] = $this->getFiles($value); |
|
| 122 | 122 | } |
| 123 | 123 | } |
| 124 | 124 | |
@@ -15,35 +15,35 @@ |
||
| 15 | 15 | |
| 16 | 16 | protected function setUp() |
| 17 | 17 | { |
| 18 | - if( !class_exists( '\Symfony\Component\HttpFoundation\Request' ) ) { |
|
| 19 | - $this->markTestSkipped( '\Symfony\Component\HttpFoundation\Request is not available' ); |
|
| 18 | + if (!class_exists('\Symfony\Component\HttpFoundation\Request')) { |
|
| 19 | + $this->markTestSkipped('\Symfony\Component\HttpFoundation\Request is not available'); |
|
| 20 | 20 | } |
| 21 | 21 | |
| 22 | - if( !class_exists( '\Symfony\Bridge\PsrHttpMessage\Factory\DiactorosFactory' ) ) { |
|
| 23 | - $this->markTestSkipped( '\Symfony\Bridge\PsrHttpMessage\Factory\DiactorosFactory is not available' ); |
|
| 22 | + if (!class_exists('\Symfony\Bridge\PsrHttpMessage\Factory\DiactorosFactory')) { |
|
| 23 | + $this->markTestSkipped('\Symfony\Bridge\PsrHttpMessage\Factory\DiactorosFactory is not available'); |
|
| 24 | 24 | } |
| 25 | 25 | |
| 26 | 26 | $view = new \Aimeos\MW\View\Standard(); |
| 27 | - $param = array( 'HTTP_HOST' => 'localhost', 'REMOTE_ADDR' => '127.0.0.1' ); |
|
| 28 | - $request = new \Symfony\Component\HttpFoundation\Request( array(), array(), array(), array(), array(), $param, 'Content' ); |
|
| 29 | - $this->object = new \Aimeos\MW\View\Helper\Request\Symfony2( $view, $request ); |
|
| 27 | + $param = array('HTTP_HOST' => 'localhost', 'REMOTE_ADDR' => '127.0.0.1'); |
|
| 28 | + $request = new \Symfony\Component\HttpFoundation\Request(array(), array(), array(), array(), array(), $param, 'Content'); |
|
| 29 | + $this->object = new \Aimeos\MW\View\Helper\Request\Symfony2($view, $request); |
|
| 30 | 30 | } |
| 31 | 31 | |
| 32 | 32 | |
| 33 | 33 | public function testTransform() |
| 34 | 34 | { |
| 35 | - $this->assertInstanceOf( '\Aimeos\MW\View\Helper\Request\Symfony2', $this->object->transform() ); |
|
| 35 | + $this->assertInstanceOf('\Aimeos\MW\View\Helper\Request\Symfony2', $this->object->transform()); |
|
| 36 | 36 | } |
| 37 | 37 | |
| 38 | 38 | |
| 39 | 39 | public function testGetClientAddress() |
| 40 | 40 | { |
| 41 | - $this->assertEquals( '127.0.0.1', $this->object->getClientAddress() ); |
|
| 41 | + $this->assertEquals('127.0.0.1', $this->object->getClientAddress()); |
|
| 42 | 42 | } |
| 43 | 43 | |
| 44 | 44 | |
| 45 | 45 | public function testGetTarget() |
| 46 | 46 | { |
| 47 | - $this->assertEquals( null, $this->object->getTarget() ); |
|
| 47 | + $this->assertEquals(null, $this->object->getTarget()); |
|
| 48 | 48 | } |
| 49 | 49 | } |
@@ -26,8 +26,8 @@ |
||
| 26 | 26 | * |
| 27 | 27 | * @param \Aimeos\MW\View\Iface $view View instance with registered view helpers |
| 28 | 28 | */ |
| 29 | - public function __construct( \Aimeos\MW\View\Iface $view ) |
|
| 29 | + public function __construct(\Aimeos\MW\View\Iface $view) |
|
| 30 | 30 | { |
| 31 | - parent::__construct( $view, new \Zend\Diactoros\Response() ); |
|
| 31 | + parent::__construct($view, new \Zend\Diactoros\Response()); |
|
| 32 | 32 | } |
| 33 | 33 | } |
@@ -17,23 +17,23 @@ |
||
| 17 | 17 | |
| 18 | 18 | protected function setUp() |
| 19 | 19 | { |
| 20 | - if( !class_exists( '\Zend\Diactoros\Response' ) ) { |
|
| 21 | - $this->markTestSkipped( '\Zend\Diactoros\Response is not available' ); |
|
| 20 | + if (!class_exists('\Zend\Diactoros\Response')) { |
|
| 21 | + $this->markTestSkipped('\Zend\Diactoros\Response is not available'); |
|
| 22 | 22 | } |
| 23 | 23 | |
| 24 | 24 | $view = new \Aimeos\MW\View\Standard(); |
| 25 | - $this->object = new \Aimeos\MW\View\Helper\Response\Symfony2( $view ); |
|
| 25 | + $this->object = new \Aimeos\MW\View\Helper\Response\Symfony2($view); |
|
| 26 | 26 | } |
| 27 | 27 | |
| 28 | 28 | |
| 29 | 29 | public function testTransform() |
| 30 | 30 | { |
| 31 | - $this->assertInstanceOf( '\Aimeos\MW\View\Helper\Response\Symfony2', $this->object->transform() ); |
|
| 31 | + $this->assertInstanceOf('\Aimeos\MW\View\Helper\Response\Symfony2', $this->object->transform()); |
|
| 32 | 32 | } |
| 33 | 33 | |
| 34 | 34 | |
| 35 | 35 | public function testCreateStream() |
| 36 | 36 | { |
| 37 | - $this->assertInstanceOf( '\Psr\Http\Message\StreamInterface', $this->object->createStream( __FILE__ ) ); |
|
| 37 | + $this->assertInstanceOf('\Psr\Http\Message\StreamInterface', $this->object->createStream(__FILE__)); |
|
| 38 | 38 | } |
| 39 | 39 | } |
@@ -25,17 +25,17 @@ discard block |
||
| 25 | 25 | */ |
| 26 | 26 | protected function setUp() |
| 27 | 27 | { |
| 28 | - if( !class_exists( '\Symfony\Component\Routing\Router' ) ) { |
|
| 29 | - $this->markTestSkipped( 'Symfony\Component\Routing\Router is not available' ); |
|
| 28 | + if (!class_exists('\Symfony\Component\Routing\Router')) { |
|
| 29 | + $this->markTestSkipped('Symfony\Component\Routing\Router is not available'); |
|
| 30 | 30 | } |
| 31 | 31 | |
| 32 | 32 | $view = new \Aimeos\MW\View\Standard(); |
| 33 | 33 | |
| 34 | - $loc = new \Symfony\Component\Config\FileLocator( array( __DIR__ . DIRECTORY_SEPARATOR . '_testfiles' ) ); |
|
| 35 | - $loader = new \Symfony\Component\Routing\Loader\PhpFileLoader( $loc ); |
|
| 36 | - $router = new \Symfony\Component\Routing\Router( $loader, 'routing.php' ); |
|
| 34 | + $loc = new \Symfony\Component\Config\FileLocator(array(__DIR__ . DIRECTORY_SEPARATOR . '_testfiles')); |
|
| 35 | + $loader = new \Symfony\Component\Routing\Loader\PhpFileLoader($loc); |
|
| 36 | + $router = new \Symfony\Component\Routing\Router($loader, 'routing.php'); |
|
| 37 | 37 | |
| 38 | - $this->object = new \Aimeos\MW\View\Helper\Url\Symfony2( $view, $router, array( 'site' => 'unittest' ) ); |
|
| 38 | + $this->object = new \Aimeos\MW\View\Helper\Url\Symfony2($view, $router, array('site' => 'unittest')); |
|
| 39 | 39 | } |
| 40 | 40 | |
| 41 | 41 | |
@@ -53,26 +53,26 @@ discard block |
||
| 53 | 53 | |
| 54 | 54 | public function testTransform() |
| 55 | 55 | { |
| 56 | - $this->assertEquals( '/unittest/lists', $this->object->transform( 'catalog_list' ) ); |
|
| 56 | + $this->assertEquals('/unittest/lists', $this->object->transform('catalog_list')); |
|
| 57 | 57 | } |
| 58 | 58 | |
| 59 | 59 | |
| 60 | 60 | public function testTransformArrays() |
| 61 | 61 | { |
| 62 | - $this->assertEquals( '/unittest/lists?test%5B0%5D=a&test%5B1%5D=b', $this->object->transform( 'catalog_list', null, null, array( 'test' => array( 'a', 'b' ) ) ) ); |
|
| 62 | + $this->assertEquals('/unittest/lists?test%5B0%5D=a&test%5B1%5D=b', $this->object->transform('catalog_list', null, null, array('test' => array('a', 'b')))); |
|
| 63 | 63 | } |
| 64 | 64 | |
| 65 | 65 | |
| 66 | 66 | public function testTransformTrailing() |
| 67 | 67 | { |
| 68 | - $this->assertEquals( '/unittest/lists?trailing=a_b', $this->object->transform( 'catalog_list', null, null, array(), array( 'a', 'b' ) ) ); |
|
| 68 | + $this->assertEquals('/unittest/lists?trailing=a_b', $this->object->transform('catalog_list', null, null, array(), array('a', 'b'))); |
|
| 69 | 69 | } |
| 70 | 70 | |
| 71 | 71 | |
| 72 | 72 | public function testTransformAbsolute() |
| 73 | 73 | { |
| 74 | - $options = array( 'absoluteUri' => true ); |
|
| 75 | - $result = $this->object->transform( 'catalog_list', null, null, array(), array(), $options ); |
|
| 76 | - $this->assertEquals( 'http://localhost/unittest/lists', $result ); |
|
| 74 | + $options = array('absoluteUri' => true); |
|
| 75 | + $result = $this->object->transform('catalog_list', null, null, array(), array(), $options); |
|
| 76 | + $this->assertEquals('http://localhost/unittest/lists', $result); |
|
| 77 | 77 | } |
| 78 | 78 | } |