@@ -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,42 +17,42 @@ |
||
| 17 | 17 | |
| 18 | 18 | protected function setUp() |
| 19 | 19 | { |
| 20 | - if( !class_exists( '\Illuminate\Http\Request' ) ) { |
|
| 21 | - $this->markTestSkipped( '\Illuminate\Http\Request is not available' ); |
|
| 20 | + if (!class_exists('\Illuminate\Http\Request')) { |
|
| 21 | + $this->markTestSkipped('\Illuminate\Http\Request is not available'); |
|
| 22 | 22 | } |
| 23 | 23 | |
| 24 | - if( !class_exists( '\Zend\Diactoros\Response' ) ) { |
|
| 25 | - $this->markTestSkipped( '\Zend\Diactoros\Response is not available' ); |
|
| 24 | + if (!class_exists('\Zend\Diactoros\Response')) { |
|
| 25 | + $this->markTestSkipped('\Zend\Diactoros\Response is not available'); |
|
| 26 | 26 | } |
| 27 | 27 | |
| 28 | 28 | $view = new \Aimeos\MW\View\Standard(); |
| 29 | - $param = array( 'HTTP_HOST' => 'localhost', 'REMOTE_ADDR' => '127.0.0.1' ); |
|
| 30 | - $request = new \Illuminate\Http\Request( array(), array(), array(), array(), array(), $param, 'Content' ); |
|
| 29 | + $param = array('HTTP_HOST' => 'localhost', 'REMOTE_ADDR' => '127.0.0.1'); |
|
| 30 | + $request = new \Illuminate\Http\Request(array(), array(), array(), array(), array(), $param, 'Content'); |
|
| 31 | 31 | |
| 32 | - $this->object = new \Aimeos\MW\View\Helper\Request\Laravel5( $view, $request ); |
|
| 32 | + $this->object = new \Aimeos\MW\View\Helper\Request\Laravel5($view, $request); |
|
| 33 | 33 | } |
| 34 | 34 | |
| 35 | 35 | |
| 36 | 36 | protected function tearDown() |
| 37 | 37 | { |
| 38 | - unset( $this->object, $this->mock ); |
|
| 38 | + unset($this->object, $this->mock); |
|
| 39 | 39 | } |
| 40 | 40 | |
| 41 | 41 | |
| 42 | 42 | public function testTransform() |
| 43 | 43 | { |
| 44 | - $this->assertInstanceOf( '\Aimeos\MW\View\Helper\Request\Laravel5', $this->object->transform() ); |
|
| 44 | + $this->assertInstanceOf('\Aimeos\MW\View\Helper\Request\Laravel5', $this->object->transform()); |
|
| 45 | 45 | } |
| 46 | 46 | |
| 47 | 47 | |
| 48 | 48 | public function testGetClientAddress() |
| 49 | 49 | { |
| 50 | - $this->assertEquals( '127.0.0.1', $this->object->getClientAddress() ); |
|
| 50 | + $this->assertEquals('127.0.0.1', $this->object->getClientAddress()); |
|
| 51 | 51 | } |
| 52 | 52 | |
| 53 | 53 | |
| 54 | 54 | public function testGetTarget() |
| 55 | 55 | { |
| 56 | - $this->assertEquals( null, $this->object->getTarget() ); |
|
| 56 | + $this->assertEquals(null, $this->object->getTarget()); |
|
| 57 | 57 | } |
| 58 | 58 | } |
@@ -17,27 +17,27 @@ |
||
| 17 | 17 | |
| 18 | 18 | protected function setUp() |
| 19 | 19 | { |
| 20 | - if( !class_exists( '\Illuminate\Http\Response' ) ) { |
|
| 21 | - $this->markTestSkipped( '\Illuminate\Http\Response is not available' ); |
|
| 20 | + if (!class_exists('\Illuminate\Http\Response')) { |
|
| 21 | + $this->markTestSkipped('\Illuminate\Http\Response is not available'); |
|
| 22 | 22 | } |
| 23 | 23 | |
| 24 | - if( !class_exists( '\Zend\Diactoros\Response' ) ) { |
|
| 25 | - $this->markTestSkipped( '\Zend\Diactoros\Response is not available' ); |
|
| 24 | + if (!class_exists('\Zend\Diactoros\Response')) { |
|
| 25 | + $this->markTestSkipped('\Zend\Diactoros\Response is not available'); |
|
| 26 | 26 | } |
| 27 | 27 | |
| 28 | 28 | $view = new \Aimeos\MW\View\Standard(); |
| 29 | - $this->object = new \Aimeos\MW\View\Helper\Response\Laravel5( $view ); |
|
| 29 | + $this->object = new \Aimeos\MW\View\Helper\Response\Laravel5($view); |
|
| 30 | 30 | } |
| 31 | 31 | |
| 32 | 32 | |
| 33 | 33 | protected function tearDown() |
| 34 | 34 | { |
| 35 | - unset( $this->object, $this->mock ); |
|
| 35 | + unset($this->object, $this->mock); |
|
| 36 | 36 | } |
| 37 | 37 | |
| 38 | 38 | |
| 39 | 39 | public function testTransform() |
| 40 | 40 | { |
| 41 | - $this->assertInstanceOf( '\Aimeos\MW\View\Helper\Response\Laravel5', $this->object->transform() ); |
|
| 41 | + $this->assertInstanceOf('\Aimeos\MW\View\Helper\Response\Laravel5', $this->object->transform()); |
|
| 42 | 42 | } |
| 43 | 43 | } |
@@ -34,11 +34,11 @@ discard block |
||
| 34 | 34 | * @param \\Aimeos\MW\View\Iface $view View instance with registered view helpers |
| 35 | 35 | * @param \Illuminate\Http\Request $request Laravel request object |
| 36 | 36 | */ |
| 37 | - public function __construct( \Aimeos\MW\View\Iface $view, \Illuminate\Http\Request $request ) |
|
| 37 | + public function __construct(\Aimeos\MW\View\Iface $view, \Illuminate\Http\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 | - if( ( $route = $this->request->route() ) !== null ) { |
|
| 63 | + if (($route = $this->request->route()) !== null) { |
|
| 64 | 64 | return $route->getName(); |
| 65 | 65 | } |
| 66 | 66 | } |
@@ -72,10 +72,10 @@ discard block |
||
| 72 | 72 | * @param \Illuminate\Http\Request $nativeRequest Laravel request object |
| 73 | 73 | * @return \Psr\Http\Message\ServerRequestInterface PSR-7 request object |
| 74 | 74 | */ |
| 75 | - protected function createRequest( \Illuminate\Http\Request $nativeRequest ) |
|
| 75 | + protected function createRequest(\Illuminate\Http\Request $nativeRequest) |
|
| 76 | 76 | { |
| 77 | - $files = ServerRequestFactory::normalizeFiles( $this->getFiles( $nativeRequest->files->all() ) ); |
|
| 78 | - $server = ServerRequestFactory::normalizeServer( $nativeRequest->server->all() ); |
|
| 77 | + $files = ServerRequestFactory::normalizeFiles($this->getFiles($nativeRequest->files->all())); |
|
| 78 | + $server = ServerRequestFactory::normalizeServer($nativeRequest->server->all()); |
|
| 79 | 79 | $headers = $nativeRequest->headers->all(); |
| 80 | 80 | $cookies = $nativeRequest->cookies->all(); |
| 81 | 81 | $post = $nativeRequest->request->all(); |
@@ -83,13 +83,13 @@ discard block |
||
| 83 | 83 | $method = $nativeRequest->getMethod(); |
| 84 | 84 | $uri = $nativeRequest->getUri(); |
| 85 | 85 | |
| 86 | - $body = new Stream( 'php://temp', 'wb+' ); |
|
| 87 | - $body->write( $nativeRequest->getContent() ); |
|
| 86 | + $body = new Stream('php://temp', 'wb+'); |
|
| 87 | + $body->write($nativeRequest->getContent()); |
|
| 88 | 88 | |
| 89 | - $request = new ServerRequest( $server, $files, $uri, $method, $body, $headers, $cookies, $query, $post ); |
|
| 89 | + $request = new ServerRequest($server, $files, $uri, $method, $body, $headers, $cookies, $query, $post); |
|
| 90 | 90 | |
| 91 | - foreach( $nativeRequest->attributes->all() as $key => $value ) { |
|
| 92 | - $request = $request->withAttribute( $key, $value ); |
|
| 91 | + foreach ($nativeRequest->attributes->all() as $key => $value) { |
|
| 92 | + $request = $request->withAttribute($key, $value); |
|
| 93 | 93 | } |
| 94 | 94 | |
| 95 | 95 | return $request; |
@@ -102,13 +102,13 @@ discard block |
||
| 102 | 102 | * @param array $files Multi-dimensional list of uploaded files from Symfony request |
| 103 | 103 | * @return array Multi-dimensional list of uploaded files as PSR-7 objects |
| 104 | 104 | */ |
| 105 | - protected function getFiles( array $files ) |
|
| 105 | + protected function getFiles(array $files) |
|
| 106 | 106 | { |
| 107 | 107 | $list = array(); |
| 108 | 108 | |
| 109 | - foreach( $files as $key => $value ) |
|
| 109 | + foreach ($files as $key => $value) |
|
| 110 | 110 | { |
| 111 | - if( $value instanceof \Symfony\Component\HttpFoundation\File\UploadedFile ) |
|
| 111 | + if ($value instanceof \Symfony\Component\HttpFoundation\File\UploadedFile) |
|
| 112 | 112 | { |
| 113 | 113 | $list[$key] = new \Zend\Diactoros\UploadedFile( |
| 114 | 114 | $value->getRealPath(), |
@@ -118,9 +118,9 @@ discard block |
||
| 118 | 118 | $value->getClientMimeType() |
| 119 | 119 | ); |
| 120 | 120 | } |
| 121 | - elseif( is_array( $value ) ) |
|
| 121 | + elseif (is_array($value)) |
|
| 122 | 122 | { |
| 123 | - $list[$key] = $this->getFiles( $value ); |
|
| 123 | + $list[$key] = $this->getFiles($value); |
|
| 124 | 124 | } |
| 125 | 125 | } |
| 126 | 126 | |
@@ -32,9 +32,9 @@ discard block |
||
| 32 | 32 | * @param \Illuminate\Contracts\Routing\UrlGenerator $builder Laravel URL builder object |
| 33 | 33 | * @param array Associative list of fixed parameters that should be available for all routes |
| 34 | 34 | */ |
| 35 | - public function __construct( \Aimeos\MW\View\Iface $view, \Illuminate\Contracts\Routing\UrlGenerator $builder, array $fixed ) |
|
| 35 | + public function __construct(\Aimeos\MW\View\Iface $view, \Illuminate\Contracts\Routing\UrlGenerator $builder, array $fixed) |
|
| 36 | 36 | { |
| 37 | - parent::__construct( $view ); |
|
| 37 | + parent::__construct($view); |
|
| 38 | 38 | |
| 39 | 39 | $this->builder = $builder; |
| 40 | 40 | $this->fixed = $fixed; |
@@ -52,12 +52,12 @@ discard block |
||
| 52 | 52 | * @param array $config Additional configuration parameter per URL |
| 53 | 53 | * @return string Complete URL that can be used in the template |
| 54 | 54 | */ |
| 55 | - public function transform( $target = null, $controller = null, $action = null, array $params = array(), array $trailing = array(), array $config = array() ) |
|
| 55 | + public function transform($target = null, $controller = null, $action = null, array $params = array(), array $trailing = array(), array $config = array()) |
|
| 56 | 56 | { |
| 57 | - $params = $this->sanitize( $params ); |
|
| 58 | - $values = $this->getValues( $config ); |
|
| 57 | + $params = $this->sanitize($params); |
|
| 58 | + $values = $this->getValues($config); |
|
| 59 | 59 | |
| 60 | - return $this->builder->route( $target, $params + $this->fixed, $values['absoluteUri'] ); |
|
| 60 | + return $this->builder->route($target, $params + $this->fixed, $values['absoluteUri']); |
|
| 61 | 61 | } |
| 62 | 62 | |
| 63 | 63 | |
@@ -67,13 +67,13 @@ discard block |
||
| 67 | 67 | * @param array $config Associative list of key/value pairs |
| 68 | 68 | * @return array Associative list of sanitized key/value pairs |
| 69 | 69 | */ |
| 70 | - protected function getValues( array $config ) |
|
| 70 | + protected function getValues(array $config) |
|
| 71 | 71 | { |
| 72 | 72 | $values = array( |
| 73 | 73 | 'absoluteUri' => false, |
| 74 | 74 | ); |
| 75 | 75 | |
| 76 | - if( isset( $config['absoluteUri'] ) ) { |
|
| 76 | + if (isset($config['absoluteUri'])) { |
|
| 77 | 77 | $values['absoluteUri'] = (bool) $config['absoluteUri']; |
| 78 | 78 | } |
| 79 | 79 | |
@@ -8,148 +8,148 @@ |
||
| 8 | 8 | |
| 9 | 9 | return array( |
| 10 | 10 | 'table' => array( |
| 11 | - 'users' => function ( \Doctrine\DBAL\Schema\Schema $schema ) { |
|
| 12 | - |
|
| 13 | - $table = $schema->createTable( 'users' ); |
|
| 14 | - |
|
| 15 | - $table->addColumn( 'id', 'integer', array( 'autoincrement' => true ) ); |
|
| 16 | - $table->addColumn( 'label', 'string', array( 'length' => 255 ) ); |
|
| 17 | - $table->addColumn( 'name', 'string', array( 'length' => 255 ) ); |
|
| 18 | - $table->addColumn( 'remember_token', 'string', array( 'length' => 100, 'notnull' => false ) ); |
|
| 19 | - $table->addColumn( 'salutation', 'string', array( 'length' => 8 ) ); |
|
| 20 | - $table->addColumn( 'company', 'string', array( 'length' => 100 ) ); |
|
| 21 | - $table->addColumn( 'vatid', 'string', array( 'length' => 32 ) ); |
|
| 22 | - $table->addColumn( 'title', 'string', array( 'length' => 64 ) ); |
|
| 23 | - $table->addColumn( 'firstname', 'string', array( 'length' => 64 ) ); |
|
| 24 | - $table->addColumn( 'lastname', 'string', array( 'length' => 64 ) ); |
|
| 25 | - $table->addColumn( 'address1', 'string', array( 'length' => 255 ) ); |
|
| 26 | - $table->addColumn( 'address2', 'string', array( 'length' => 255 ) ); |
|
| 27 | - $table->addColumn( 'address3', 'string', array( 'length' => 255 ) ); |
|
| 28 | - $table->addColumn( 'postal', 'string', array( 'length' => 16 ) ); |
|
| 29 | - $table->addColumn( 'city', 'string', array( 'length' => 255 ) ); |
|
| 30 | - $table->addColumn( 'state', 'string', array( 'length' => 255 ) ); |
|
| 31 | - $table->addColumn( 'langid', 'string', array( 'length' => 5, 'notnull' => false ) ); |
|
| 32 | - $table->addColumn( 'countryid', 'string', array( 'length' => 2, 'notnull' => false, 'fixed' => true ) ); |
|
| 33 | - $table->addColumn( 'telephone', 'string', array( 'length' => 32 ) ); |
|
| 34 | - $table->addColumn( 'telefax', 'string', array( 'length' => 32 ) ); |
|
| 35 | - $table->addColumn( 'website', 'string', array( 'length' => 255 ) ); |
|
| 36 | - $table->addColumn( 'email', 'string', array( 'length' => 255 ) ); |
|
| 37 | - $table->addColumn( 'password', 'string', array( 'length' => 255 ) ); |
|
| 38 | - $table->addColumn( 'birthday', 'date', array( 'notnull' => false ) ); |
|
| 39 | - $table->addColumn( 'vdate', 'date', array( 'notnull' => false ) ); |
|
| 40 | - $table->addColumn( 'status', 'smallint', array() ); |
|
| 41 | - $table->addColumn( 'updated_at', 'datetime', array() ); |
|
| 42 | - $table->addColumn( 'created_at', 'datetime', array() ); |
|
| 43 | - $table->addColumn( 'editor', 'string', array('length' => 255 ) ); |
|
| 44 | - |
|
| 45 | - $table->setPrimaryKey( array( 'id' ), 'pk_mscus_id' ); |
|
| 46 | - $table->addUniqueIndex( array( 'email' ), 'users_email_unique' ); |
|
| 47 | - $table->addIndex( array( 'langid' ), 'users_langid_index' ); |
|
| 48 | - $table->addIndex( array( 'status', 'lastname', 'firstname' ), 'users_status_lastname_firstname_index' ); |
|
| 49 | - $table->addIndex( array( 'status', 'address1', 'address2' ), 'users_status_address1_address2_index' ); |
|
| 50 | - $table->addIndex( array( 'status', 'postal', 'city' ), 'users_status_postal_city_index' ); |
|
| 51 | - $table->addIndex( array( 'lastname' ), 'users_lastname_index' ); |
|
| 52 | - $table->addIndex( array( 'address1' ), 'users_address1_index' ); |
|
| 53 | - $table->addIndex( array( 'city' ), 'users_city_index' ); |
|
| 54 | - $table->addIndex( array( 'postal' ), 'users_postal_index' ); |
|
| 11 | + 'users' => function(\Doctrine\DBAL\Schema\Schema $schema) { |
|
| 12 | + |
|
| 13 | + $table = $schema->createTable('users'); |
|
| 14 | + |
|
| 15 | + $table->addColumn('id', 'integer', array('autoincrement' => true)); |
|
| 16 | + $table->addColumn('label', 'string', array('length' => 255)); |
|
| 17 | + $table->addColumn('name', 'string', array('length' => 255)); |
|
| 18 | + $table->addColumn('remember_token', 'string', array('length' => 100, 'notnull' => false)); |
|
| 19 | + $table->addColumn('salutation', 'string', array('length' => 8)); |
|
| 20 | + $table->addColumn('company', 'string', array('length' => 100)); |
|
| 21 | + $table->addColumn('vatid', 'string', array('length' => 32)); |
|
| 22 | + $table->addColumn('title', 'string', array('length' => 64)); |
|
| 23 | + $table->addColumn('firstname', 'string', array('length' => 64)); |
|
| 24 | + $table->addColumn('lastname', 'string', array('length' => 64)); |
|
| 25 | + $table->addColumn('address1', 'string', array('length' => 255)); |
|
| 26 | + $table->addColumn('address2', 'string', array('length' => 255)); |
|
| 27 | + $table->addColumn('address3', 'string', array('length' => 255)); |
|
| 28 | + $table->addColumn('postal', 'string', array('length' => 16)); |
|
| 29 | + $table->addColumn('city', 'string', array('length' => 255)); |
|
| 30 | + $table->addColumn('state', 'string', array('length' => 255)); |
|
| 31 | + $table->addColumn('langid', 'string', array('length' => 5, 'notnull' => false)); |
|
| 32 | + $table->addColumn('countryid', 'string', array('length' => 2, 'notnull' => false, 'fixed' => true)); |
|
| 33 | + $table->addColumn('telephone', 'string', array('length' => 32)); |
|
| 34 | + $table->addColumn('telefax', 'string', array('length' => 32)); |
|
| 35 | + $table->addColumn('website', 'string', array('length' => 255)); |
|
| 36 | + $table->addColumn('email', 'string', array('length' => 255)); |
|
| 37 | + $table->addColumn('password', 'string', array('length' => 255)); |
|
| 38 | + $table->addColumn('birthday', 'date', array('notnull' => false)); |
|
| 39 | + $table->addColumn('vdate', 'date', array('notnull' => false)); |
|
| 40 | + $table->addColumn('status', 'smallint', array()); |
|
| 41 | + $table->addColumn('updated_at', 'datetime', array()); |
|
| 42 | + $table->addColumn('created_at', 'datetime', array()); |
|
| 43 | + $table->addColumn('editor', 'string', array('length' => 255)); |
|
| 44 | + |
|
| 45 | + $table->setPrimaryKey(array('id'), 'pk_mscus_id'); |
|
| 46 | + $table->addUniqueIndex(array('email'), 'users_email_unique'); |
|
| 47 | + $table->addIndex(array('langid'), 'users_langid_index'); |
|
| 48 | + $table->addIndex(array('status', 'lastname', 'firstname'), 'users_status_lastname_firstname_index'); |
|
| 49 | + $table->addIndex(array('status', 'address1', 'address2'), 'users_status_address1_address2_index'); |
|
| 50 | + $table->addIndex(array('status', 'postal', 'city'), 'users_status_postal_city_index'); |
|
| 51 | + $table->addIndex(array('lastname'), 'users_lastname_index'); |
|
| 52 | + $table->addIndex(array('address1'), 'users_address1_index'); |
|
| 53 | + $table->addIndex(array('city'), 'users_city_index'); |
|
| 54 | + $table->addIndex(array('postal'), 'users_postal_index'); |
|
| 55 | 55 | |
| 56 | 56 | return $schema; |
| 57 | 57 | }, |
| 58 | 58 | |
| 59 | - 'users_address' => function ( \Doctrine\DBAL\Schema\Schema $schema ) { |
|
| 60 | - |
|
| 61 | - $table = $schema->createTable( 'users_address' ); |
|
| 62 | - |
|
| 63 | - $table->addColumn( 'id', 'integer', array( 'autoincrement' => true ) ); |
|
| 64 | - $table->addColumn( 'siteid', 'integer', array() ); |
|
| 65 | - $table->addColumn( 'parentid', 'integer', array() ); |
|
| 66 | - $table->addColumn( 'company', 'string', array( 'length' => 100 ) ); |
|
| 67 | - $table->addColumn( 'vatid', 'string', array( 'length' => 32 ) ); |
|
| 68 | - $table->addColumn( 'salutation', 'string', array( 'length' => 8 ) ); |
|
| 69 | - $table->addColumn( 'title', 'string', array( 'length' => 64 ) ); |
|
| 70 | - $table->addColumn( 'firstname', 'string', array( 'length' => 64 ) ); |
|
| 71 | - $table->addColumn( 'lastname', 'string', array( 'length' => 64 ) ); |
|
| 72 | - $table->addColumn( 'address1', 'string', array( 'length' => 255 ) ); |
|
| 73 | - $table->addColumn( 'address2', 'string', array( 'length' => 255 ) ); |
|
| 74 | - $table->addColumn( 'address3', 'string', array( 'length' => 255 ) ); |
|
| 75 | - $table->addColumn( 'postal', 'string', array( 'length' => 16 ) ); |
|
| 76 | - $table->addColumn( 'city', 'string', array( 'length' => 255 ) ); |
|
| 77 | - $table->addColumn( 'state', 'string', array( 'length' => 255 ) ); |
|
| 78 | - $table->addColumn( 'langid', 'string', array( 'length' => 5, 'notnull' => false ) ); |
|
| 79 | - $table->addColumn( 'countryid', 'string', array( 'length' => 2, 'notnull' => false, 'fixed' => true ) ); |
|
| 80 | - $table->addColumn( 'telephone', 'string', array( 'length' => 32 ) ); |
|
| 81 | - $table->addColumn( 'email', 'string', array( 'length' => 255 ) ); |
|
| 82 | - $table->addColumn( 'telefax', 'string', array( 'length' => 255 ) ); |
|
| 83 | - $table->addColumn( 'website', 'string', array( 'length' => 255 ) ); |
|
| 84 | - $table->addColumn( 'flag', 'integer', array() ); |
|
| 85 | - $table->addColumn( 'pos', 'smallint', array() ); |
|
| 86 | - $table->addColumn( 'mtime', 'datetime', array() ); |
|
| 87 | - $table->addColumn( 'ctime', 'datetime', array() ); |
|
| 88 | - $table->addColumn( 'editor', 'string', array('length' => 255 ) ); |
|
| 89 | - |
|
| 90 | - $table->setPrimaryKey( array( 'id' ), 'pk_lvuad_id' ); |
|
| 91 | - $table->addIndex( array( 'lastname', 'firstname' ), 'idx_lvuad_ln_fn' ); |
|
| 92 | - $table->addIndex( array( 'address1', 'address2' ), 'idx_lvuad_ad1_ad2' ); |
|
| 93 | - $table->addIndex( array( 'postal', 'city' ), 'idx_lvuad_post_ci' ); |
|
| 94 | - $table->addIndex( array( 'parentid' ), 'idx_lvuad_pid' ); |
|
| 95 | - $table->addIndex( array( 'city' ), 'idx_lvuad_city' ); |
|
| 96 | - $table->addIndex( array( 'email' ), 'idx_lvuad_email' ); |
|
| 59 | + 'users_address' => function(\Doctrine\DBAL\Schema\Schema $schema) { |
|
| 60 | + |
|
| 61 | + $table = $schema->createTable('users_address'); |
|
| 62 | + |
|
| 63 | + $table->addColumn('id', 'integer', array('autoincrement' => true)); |
|
| 64 | + $table->addColumn('siteid', 'integer', array()); |
|
| 65 | + $table->addColumn('parentid', 'integer', array()); |
|
| 66 | + $table->addColumn('company', 'string', array('length' => 100)); |
|
| 67 | + $table->addColumn('vatid', 'string', array('length' => 32)); |
|
| 68 | + $table->addColumn('salutation', 'string', array('length' => 8)); |
|
| 69 | + $table->addColumn('title', 'string', array('length' => 64)); |
|
| 70 | + $table->addColumn('firstname', 'string', array('length' => 64)); |
|
| 71 | + $table->addColumn('lastname', 'string', array('length' => 64)); |
|
| 72 | + $table->addColumn('address1', 'string', array('length' => 255)); |
|
| 73 | + $table->addColumn('address2', 'string', array('length' => 255)); |
|
| 74 | + $table->addColumn('address3', 'string', array('length' => 255)); |
|
| 75 | + $table->addColumn('postal', 'string', array('length' => 16)); |
|
| 76 | + $table->addColumn('city', 'string', array('length' => 255)); |
|
| 77 | + $table->addColumn('state', 'string', array('length' => 255)); |
|
| 78 | + $table->addColumn('langid', 'string', array('length' => 5, 'notnull' => false)); |
|
| 79 | + $table->addColumn('countryid', 'string', array('length' => 2, 'notnull' => false, 'fixed' => true)); |
|
| 80 | + $table->addColumn('telephone', 'string', array('length' => 32)); |
|
| 81 | + $table->addColumn('email', 'string', array('length' => 255)); |
|
| 82 | + $table->addColumn('telefax', 'string', array('length' => 255)); |
|
| 83 | + $table->addColumn('website', 'string', array('length' => 255)); |
|
| 84 | + $table->addColumn('flag', 'integer', array()); |
|
| 85 | + $table->addColumn('pos', 'smallint', array()); |
|
| 86 | + $table->addColumn('mtime', 'datetime', array()); |
|
| 87 | + $table->addColumn('ctime', 'datetime', array()); |
|
| 88 | + $table->addColumn('editor', 'string', array('length' => 255)); |
|
| 89 | + |
|
| 90 | + $table->setPrimaryKey(array('id'), 'pk_lvuad_id'); |
|
| 91 | + $table->addIndex(array('lastname', 'firstname'), 'idx_lvuad_ln_fn'); |
|
| 92 | + $table->addIndex(array('address1', 'address2'), 'idx_lvuad_ad1_ad2'); |
|
| 93 | + $table->addIndex(array('postal', 'city'), 'idx_lvuad_post_ci'); |
|
| 94 | + $table->addIndex(array('parentid'), 'idx_lvuad_pid'); |
|
| 95 | + $table->addIndex(array('city'), 'idx_lvuad_city'); |
|
| 96 | + $table->addIndex(array('email'), 'idx_lvuad_email'); |
|
| 97 | 97 | |
| 98 | 98 | return $schema; |
| 99 | 99 | }, |
| 100 | 100 | |
| 101 | - 'users_list_type' => function ( \Doctrine\DBAL\Schema\Schema $schema ) { |
|
| 101 | + 'users_list_type' => function(\Doctrine\DBAL\Schema\Schema $schema) { |
|
| 102 | 102 | |
| 103 | - $table = $schema->createTable( 'users_list_type' ); |
|
| 103 | + $table = $schema->createTable('users_list_type'); |
|
| 104 | 104 | |
| 105 | - $table->addColumn( 'id', 'integer', array( 'autoincrement' => true ) ); |
|
| 106 | - $table->addColumn( 'siteid', 'integer', array() ); |
|
| 107 | - $table->addColumn( 'domain', 'string', array( 'length' => 32 ) ); |
|
| 108 | - $table->addColumn( 'code', 'string', array( 'length' => 32 ) ); |
|
| 109 | - $table->addColumn( 'label', 'string', array( 'length' => 255 ) ); |
|
| 110 | - $table->addColumn( 'status', 'smallint', array() ); |
|
| 111 | - $table->addColumn( 'mtime', 'datetime', array() ); |
|
| 112 | - $table->addColumn( 'ctime', 'datetime', array() ); |
|
| 113 | - $table->addColumn( 'editor', 'string', array( 'length' => 255 ) ); |
|
| 105 | + $table->addColumn('id', 'integer', array('autoincrement' => true)); |
|
| 106 | + $table->addColumn('siteid', 'integer', array()); |
|
| 107 | + $table->addColumn('domain', 'string', array('length' => 32)); |
|
| 108 | + $table->addColumn('code', 'string', array('length' => 32)); |
|
| 109 | + $table->addColumn('label', 'string', array('length' => 255)); |
|
| 110 | + $table->addColumn('status', 'smallint', array()); |
|
| 111 | + $table->addColumn('mtime', 'datetime', array()); |
|
| 112 | + $table->addColumn('ctime', 'datetime', array()); |
|
| 113 | + $table->addColumn('editor', 'string', array('length' => 255)); |
|
| 114 | 114 | |
| 115 | - $table->setPrimaryKey( array( 'id' ), 'pk_lvulity_id' ); |
|
| 116 | - $table->addUniqueIndex( array( 'siteid', 'domain', 'code' ), 'unq_lvulity_sid_dom_code' ); |
|
| 117 | - $table->addIndex( array( 'siteid', 'status' ), 'idx_lvulity_sid_status' ); |
|
| 118 | - $table->addIndex( array( 'siteid', 'label' ), 'idx_lvulity_sid_label' ); |
|
| 119 | - $table->addIndex( array( 'siteid', 'code' ), 'idx_lvulity_sid_code' ); |
|
| 115 | + $table->setPrimaryKey(array('id'), 'pk_lvulity_id'); |
|
| 116 | + $table->addUniqueIndex(array('siteid', 'domain', 'code'), 'unq_lvulity_sid_dom_code'); |
|
| 117 | + $table->addIndex(array('siteid', 'status'), 'idx_lvulity_sid_status'); |
|
| 118 | + $table->addIndex(array('siteid', 'label'), 'idx_lvulity_sid_label'); |
|
| 119 | + $table->addIndex(array('siteid', 'code'), 'idx_lvulity_sid_code'); |
|
| 120 | 120 | |
| 121 | 121 | return $schema; |
| 122 | 122 | }, |
| 123 | 123 | |
| 124 | - 'users_list' => function ( \Doctrine\DBAL\Schema\Schema $schema ) { |
|
| 125 | - |
|
| 126 | - $table = $schema->createTable( 'users_list' ); |
|
| 127 | - |
|
| 128 | - $table->addColumn( 'id', 'integer', array( 'autoincrement' => true ) ); |
|
| 129 | - $table->addColumn( 'parentid', 'integer', array() ); |
|
| 130 | - $table->addColumn( 'siteid', 'integer', array() ); |
|
| 131 | - $table->addColumn( 'typeid', 'integer', array() ); |
|
| 132 | - $table->addColumn( 'domain', 'string', array( 'length' => 32 ) ); |
|
| 133 | - $table->addColumn( 'refid', 'string', array( 'length' => 32 ) ); |
|
| 134 | - $table->addColumn( 'start', 'datetime', array( 'notnull' => false ) ); |
|
| 135 | - $table->addColumn( 'end', 'datetime', array( 'notnull' => false ) ); |
|
| 136 | - $table->addColumn( 'config', 'text', array( 'length' => 0xffff ) ); |
|
| 137 | - $table->addColumn( 'pos', 'integer', array() ); |
|
| 138 | - $table->addColumn( 'status', 'smallint', array() ); |
|
| 139 | - $table->addColumn( 'mtime', 'datetime', array() ); |
|
| 140 | - $table->addColumn( 'ctime', 'datetime', array() ); |
|
| 141 | - $table->addColumn( 'editor', 'string', array( 'length' => 255 ) ); |
|
| 142 | - |
|
| 143 | - $table->setPrimaryKey( array( 'id' ), 'pk_lvuli_id' ); |
|
| 144 | - $table->addUniqueIndex( array( 'siteid', 'domain', 'refid', 'typeid', 'parentid' ), 'unq_lvuli_sid_dm_rid_tid_pid' ); |
|
| 145 | - $table->addIndex( array( 'siteid', 'status', 'start', 'end' ), 'idx_lvuli_sid_stat_start_end' ); |
|
| 146 | - $table->addIndex( array( 'parentid', 'siteid', 'refid', 'domain', 'typeid' ), 'idx_lvuli_pid_sid_rid_dom_tid' ); |
|
| 147 | - $table->addIndex( array( 'parentid', 'siteid', 'start' ), 'idx_lvuli_pid_sid_start' ); |
|
| 148 | - $table->addIndex( array( 'parentid', 'siteid', 'end' ), 'idx_lvuli_pid_sid_end' ); |
|
| 149 | - $table->addIndex( array( 'parentid', 'siteid', 'pos' ), 'idx_lvuli_pid_sid_pos' ); |
|
| 150 | - |
|
| 151 | - $table->addForeignKeyConstraint( 'users_list_type', array( 'typeid' ), array( 'id' ), |
|
| 152 | - array( 'onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE' ), 'fk_lvuli_typeid' ); |
|
| 124 | + 'users_list' => function(\Doctrine\DBAL\Schema\Schema $schema) { |
|
| 125 | + |
|
| 126 | + $table = $schema->createTable('users_list'); |
|
| 127 | + |
|
| 128 | + $table->addColumn('id', 'integer', array('autoincrement' => true)); |
|
| 129 | + $table->addColumn('parentid', 'integer', array()); |
|
| 130 | + $table->addColumn('siteid', 'integer', array()); |
|
| 131 | + $table->addColumn('typeid', 'integer', array()); |
|
| 132 | + $table->addColumn('domain', 'string', array('length' => 32)); |
|
| 133 | + $table->addColumn('refid', 'string', array('length' => 32)); |
|
| 134 | + $table->addColumn('start', 'datetime', array('notnull' => false)); |
|
| 135 | + $table->addColumn('end', 'datetime', array('notnull' => false)); |
|
| 136 | + $table->addColumn('config', 'text', array('length' => 0xffff)); |
|
| 137 | + $table->addColumn('pos', 'integer', array()); |
|
| 138 | + $table->addColumn('status', 'smallint', array()); |
|
| 139 | + $table->addColumn('mtime', 'datetime', array()); |
|
| 140 | + $table->addColumn('ctime', 'datetime', array()); |
|
| 141 | + $table->addColumn('editor', 'string', array('length' => 255)); |
|
| 142 | + |
|
| 143 | + $table->setPrimaryKey(array('id'), 'pk_lvuli_id'); |
|
| 144 | + $table->addUniqueIndex(array('siteid', 'domain', 'refid', 'typeid', 'parentid'), 'unq_lvuli_sid_dm_rid_tid_pid'); |
|
| 145 | + $table->addIndex(array('siteid', 'status', 'start', 'end'), 'idx_lvuli_sid_stat_start_end'); |
|
| 146 | + $table->addIndex(array('parentid', 'siteid', 'refid', 'domain', 'typeid'), 'idx_lvuli_pid_sid_rid_dom_tid'); |
|
| 147 | + $table->addIndex(array('parentid', 'siteid', 'start'), 'idx_lvuli_pid_sid_start'); |
|
| 148 | + $table->addIndex(array('parentid', 'siteid', 'end'), 'idx_lvuli_pid_sid_end'); |
|
| 149 | + $table->addIndex(array('parentid', 'siteid', 'pos'), 'idx_lvuli_pid_sid_pos'); |
|
| 150 | + |
|
| 151 | + $table->addForeignKeyConstraint('users_list_type', array('typeid'), array('id'), |
|
| 152 | + array('onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE'), 'fk_lvuli_typeid'); |
|
| 153 | 153 | |
| 154 | 154 | return $schema; |
| 155 | 155 | }, |
@@ -21,7 +21,7 @@ discard block |
||
| 21 | 21 | */ |
| 22 | 22 | public function getPostDependencies() |
| 23 | 23 | { |
| 24 | - return array( 'MShopAddTypeData' ); |
|
| 24 | + return array('MShopAddTypeData'); |
|
| 25 | 25 | } |
| 26 | 26 | |
| 27 | 27 | |
@@ -30,15 +30,15 @@ discard block |
||
| 30 | 30 | */ |
| 31 | 31 | public function migrate() |
| 32 | 32 | { |
| 33 | - $this->msg( 'Creating Aimeos Laravel user tables', 0 ); |
|
| 34 | - $this->status( '' ); |
|
| 33 | + $this->msg('Creating Aimeos Laravel user tables', 0); |
|
| 34 | + $this->status(''); |
|
| 35 | 35 | |
| 36 | 36 | $ds = DIRECTORY_SEPARATOR; |
| 37 | 37 | |
| 38 | 38 | $files = array( |
| 39 | - 'db-customer' => __DIR__ . $ds . 'default' . $ds . 'schema' . $ds . 'customer.php', |
|
| 39 | + 'db-customer' => __DIR__.$ds.'default'.$ds.'schema'.$ds.'customer.php', |
|
| 40 | 40 | ); |
| 41 | 41 | |
| 42 | - $this->setupSchema( $files ); |
|
| 42 | + $this->setupSchema($files); |
|
| 43 | 43 | } |
| 44 | 44 | } |
@@ -22,14 +22,14 @@ discard block |
||
| 22 | 22 | { |
| 23 | 23 | $context = \TestHelper::getContext(); |
| 24 | 24 | $this->editor = $context->getEditor(); |
| 25 | - $this->object = new \Aimeos\MShop\Customer\Manager\Laravel( $context ); |
|
| 25 | + $this->object = new \Aimeos\MShop\Customer\Manager\Laravel($context); |
|
| 26 | 26 | |
| 27 | 27 | $this->fixture = array( |
| 28 | 28 | 'label' => 'unitTest', |
| 29 | 29 | 'status' => 2, |
| 30 | 30 | ); |
| 31 | 31 | |
| 32 | - $this->address = new \Aimeos\MShop\Common\Item\Address\Standard( 'common.address.' ); |
|
| 32 | + $this->address = new \Aimeos\MShop\Common\Item\Address\Standard('common.address.'); |
|
| 33 | 33 | } |
| 34 | 34 | |
| 35 | 35 | |
@@ -38,28 +38,28 @@ discard block |
||
| 38 | 38 | */ |
| 39 | 39 | protected function tearDown() |
| 40 | 40 | { |
| 41 | - unset( $this->object, $this->fixture, $this->address ); |
|
| 41 | + unset($this->object, $this->fixture, $this->address); |
|
| 42 | 42 | } |
| 43 | 43 | |
| 44 | 44 | |
| 45 | 45 | public function testCleanup() |
| 46 | 46 | { |
| 47 | - $this->object->cleanup( array( -1 ) ); |
|
| 47 | + $this->object->cleanup(array( -1 )); |
|
| 48 | 48 | } |
| 49 | 49 | |
| 50 | 50 | |
| 51 | 51 | public function testGetSearchAttributes() |
| 52 | 52 | { |
| 53 | - foreach( $this->object->getSearchAttributes() as $attribute ) |
|
| 53 | + foreach ($this->object->getSearchAttributes() as $attribute) |
|
| 54 | 54 | { |
| 55 | - $this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Attribute\\Iface', $attribute ); |
|
| 55 | + $this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Attribute\\Iface', $attribute); |
|
| 56 | 56 | } |
| 57 | 57 | } |
| 58 | 58 | |
| 59 | 59 | |
| 60 | 60 | public function testCreateItem() |
| 61 | 61 | { |
| 62 | - $this->assertInstanceOf( '\\Aimeos\\MShop\\Customer\\Item\\Iface', $this->object->createItem() ); |
|
| 62 | + $this->assertInstanceOf('\\Aimeos\\MShop\\Customer\\Item\\Iface', $this->object->createItem()); |
|
| 63 | 63 | } |
| 64 | 64 | |
| 65 | 65 | |
@@ -67,21 +67,21 @@ discard block |
||
| 67 | 67 | { |
| 68 | 68 | $search = $this->object->createSearch(); |
| 69 | 69 | $conditions = array( |
| 70 | - $search->compare( '==', 'customer.code', 'unitCustomer3' ), |
|
| 71 | - $search->compare( '==', 'customer.editor', $this->editor ) |
|
| 70 | + $search->compare('==', 'customer.code', 'unitCustomer3'), |
|
| 71 | + $search->compare('==', 'customer.editor', $this->editor) |
|
| 72 | 72 | ); |
| 73 | - $search->setConditions( $search->combine( '&&', $conditions ) ); |
|
| 74 | - $items = $this->object->searchItems( $search, array( 'text' ) ); |
|
| 73 | + $search->setConditions($search->combine('&&', $conditions)); |
|
| 74 | + $items = $this->object->searchItems($search, array('text')); |
|
| 75 | 75 | |
| 76 | - if( ( $expected = reset( $items ) ) === false ) { |
|
| 77 | - throw new \Exception( 'No customer item with code "unitCustomer3" found' ); |
|
| 76 | + if (($expected = reset($items)) === false) { |
|
| 77 | + throw new \Exception('No customer item with code "unitCustomer3" found'); |
|
| 78 | 78 | } |
| 79 | 79 | |
| 80 | - $actual = $this->object->getItem( $expected->getId(), array( 'text' ) ); |
|
| 80 | + $actual = $this->object->getItem($expected->getId(), array('text')); |
|
| 81 | 81 | |
| 82 | - $this->assertEquals( $expected, $actual ); |
|
| 83 | - $this->assertEquals( 3, count( $actual->getListItems( 'text' ) ) ); |
|
| 84 | - $this->assertEquals( 3, count( $actual->getRefItems( 'text' ) ) ); |
|
| 82 | + $this->assertEquals($expected, $actual); |
|
| 83 | + $this->assertEquals(3, count($actual->getListItems('text'))); |
|
| 84 | + $this->assertEquals(3, count($actual->getRefItems('text'))); |
|
| 85 | 85 | } |
| 86 | 86 | |
| 87 | 87 | |
@@ -89,54 +89,54 @@ discard block |
||
| 89 | 89 | { |
| 90 | 90 | $item = $this->object->createItem(); |
| 91 | 91 | |
| 92 | - $item->setCode( 'unitTest' ); |
|
| 93 | - $item->setLabel( 'unitTest' ); |
|
| 94 | - $this->object->saveItem( $item ); |
|
| 95 | - $itemSaved = $this->object->getItem( $item->getId() ); |
|
| 92 | + $item->setCode('unitTest'); |
|
| 93 | + $item->setLabel('unitTest'); |
|
| 94 | + $this->object->saveItem($item); |
|
| 95 | + $itemSaved = $this->object->getItem($item->getId()); |
|
| 96 | 96 | |
| 97 | 97 | $itemExp = clone $itemSaved; |
| 98 | - $itemExp->setCode( 'unitTest2' ); |
|
| 99 | - $itemExp->setLabel( 'unitTest2' ); |
|
| 100 | - $this->object->saveItem( $itemExp ); |
|
| 101 | - $itemUpd = $this->object->getItem( $itemExp->getId() ); |
|
| 102 | - |
|
| 103 | - $this->object->deleteItem( $item->getId() ); |
|
| 104 | - |
|
| 105 | - $this->assertTrue( $item->getId() !== null ); |
|
| 106 | - $this->assertEquals( $item->getId(), $itemSaved->getId() ); |
|
| 107 | - $this->assertEquals( $item->getSiteId(), $itemSaved->getSiteId() ); |
|
| 108 | - $this->assertEquals( $item->getStatus(), $itemSaved->getStatus() ); |
|
| 109 | - $this->assertEquals( $item->getCode(), $itemSaved->getCode() ); |
|
| 110 | - $this->assertEquals( $item->getLabel(), $itemSaved->getLabel() ); |
|
| 111 | - $this->assertEquals( $item->getPaymentAddress(), $itemSaved->getPaymentAddress() ); |
|
| 112 | - $this->assertEquals( $item->getBirthday(), $itemSaved->getBirthday() ); |
|
| 113 | - $this->assertEquals( $item->getPassword(), $itemSaved->getPassword() ); |
|
| 114 | - |
|
| 115 | - $this->assertEquals( $this->editor, $itemSaved->getEditor() ); |
|
| 116 | - $this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated() ); |
|
| 117 | - $this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeModified() ); |
|
| 118 | - |
|
| 119 | - $this->assertEquals( $itemExp->getId(), $itemUpd->getId() ); |
|
| 120 | - $this->assertEquals( $itemExp->getSiteId(), $itemUpd->getSiteId() ); |
|
| 121 | - $this->assertEquals( $itemExp->getStatus(), $itemUpd->getStatus() ); |
|
| 122 | - $this->assertEquals( $itemExp->getCode(), $itemUpd->getCode() ); |
|
| 123 | - $this->assertEquals( $itemExp->getLabel(), $itemUpd->getLabel() ); |
|
| 124 | - $this->assertEquals( $itemExp->getPaymentAddress(), $itemUpd->getPaymentAddress() ); |
|
| 125 | - $this->assertEquals( $itemExp->getBirthday(), $itemUpd->getBirthday() ); |
|
| 126 | - $this->assertEquals( $itemExp->getPassword(), $itemUpd->getPassword() ); |
|
| 127 | - |
|
| 128 | - $this->assertEquals( $this->editor, $itemUpd->getEditor() ); |
|
| 129 | - $this->assertEquals( $itemExp->getTimeCreated(), $itemUpd->getTimeCreated() ); |
|
| 130 | - $this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemUpd->getTimeModified() ); |
|
| 131 | - |
|
| 132 | - $this->setExpectedException( '\\Aimeos\\MShop\\Exception' ); |
|
| 133 | - $this->object->getItem( $item->getId() ); |
|
| 98 | + $itemExp->setCode('unitTest2'); |
|
| 99 | + $itemExp->setLabel('unitTest2'); |
|
| 100 | + $this->object->saveItem($itemExp); |
|
| 101 | + $itemUpd = $this->object->getItem($itemExp->getId()); |
|
| 102 | + |
|
| 103 | + $this->object->deleteItem($item->getId()); |
|
| 104 | + |
|
| 105 | + $this->assertTrue($item->getId() !== null); |
|
| 106 | + $this->assertEquals($item->getId(), $itemSaved->getId()); |
|
| 107 | + $this->assertEquals($item->getSiteId(), $itemSaved->getSiteId()); |
|
| 108 | + $this->assertEquals($item->getStatus(), $itemSaved->getStatus()); |
|
| 109 | + $this->assertEquals($item->getCode(), $itemSaved->getCode()); |
|
| 110 | + $this->assertEquals($item->getLabel(), $itemSaved->getLabel()); |
|
| 111 | + $this->assertEquals($item->getPaymentAddress(), $itemSaved->getPaymentAddress()); |
|
| 112 | + $this->assertEquals($item->getBirthday(), $itemSaved->getBirthday()); |
|
| 113 | + $this->assertEquals($item->getPassword(), $itemSaved->getPassword()); |
|
| 114 | + |
|
| 115 | + $this->assertEquals($this->editor, $itemSaved->getEditor()); |
|
| 116 | + $this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated()); |
|
| 117 | + $this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeModified()); |
|
| 118 | + |
|
| 119 | + $this->assertEquals($itemExp->getId(), $itemUpd->getId()); |
|
| 120 | + $this->assertEquals($itemExp->getSiteId(), $itemUpd->getSiteId()); |
|
| 121 | + $this->assertEquals($itemExp->getStatus(), $itemUpd->getStatus()); |
|
| 122 | + $this->assertEquals($itemExp->getCode(), $itemUpd->getCode()); |
|
| 123 | + $this->assertEquals($itemExp->getLabel(), $itemUpd->getLabel()); |
|
| 124 | + $this->assertEquals($itemExp->getPaymentAddress(), $itemUpd->getPaymentAddress()); |
|
| 125 | + $this->assertEquals($itemExp->getBirthday(), $itemUpd->getBirthday()); |
|
| 126 | + $this->assertEquals($itemExp->getPassword(), $itemUpd->getPassword()); |
|
| 127 | + |
|
| 128 | + $this->assertEquals($this->editor, $itemUpd->getEditor()); |
|
| 129 | + $this->assertEquals($itemExp->getTimeCreated(), $itemUpd->getTimeCreated()); |
|
| 130 | + $this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemUpd->getTimeModified()); |
|
| 131 | + |
|
| 132 | + $this->setExpectedException('\\Aimeos\\MShop\\Exception'); |
|
| 133 | + $this->object->getItem($item->getId()); |
|
| 134 | 134 | } |
| 135 | 135 | |
| 136 | 136 | |
| 137 | 137 | public function testCreateSearch() |
| 138 | 138 | { |
| 139 | - $this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $this->object->createSearch() ); |
|
| 139 | + $this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $this->object->createSearch()); |
|
| 140 | 140 | } |
| 141 | 141 | |
| 142 | 142 | |
@@ -146,65 +146,65 @@ discard block |
||
| 146 | 146 | $search = $this->object->createSearch(); |
| 147 | 147 | |
| 148 | 148 | $expr = array(); |
| 149 | - $expr[] = $search->compare( '!=', 'customer.id', null ); |
|
| 150 | - $expr[] = $search->compare( '==', 'customer.label', 'Erika Mustermann' ); |
|
| 151 | - $expr[] = $search->compare( '==', 'customer.code', 'unitCustomer2' ); |
|
| 152 | - |
|
| 153 | - $expr[] = $search->compare( '>=', 'customer.salutation', '' ); |
|
| 154 | - $expr[] = $search->compare( '>=', 'customer.company', '' ); |
|
| 155 | - $expr[] = $search->compare( '>=', 'customer.vatid', '' ); |
|
| 156 | - $expr[] = $search->compare( '>=', 'customer.title', '' ); |
|
| 157 | - $expr[] = $search->compare( '>=', 'customer.firstname', '' ); |
|
| 158 | - $expr[] = $search->compare( '>=', 'customer.lastname', '' ); |
|
| 159 | - $expr[] = $search->compare( '>=', 'customer.address1', '' ); |
|
| 160 | - $expr[] = $search->compare( '>=', 'customer.address2', '' ); |
|
| 161 | - $expr[] = $search->compare( '>=', 'customer.address3', '' ); |
|
| 162 | - $expr[] = $search->compare( '>=', 'customer.postal', '' ); |
|
| 163 | - $expr[] = $search->compare( '>=', 'customer.city', '' ); |
|
| 164 | - $expr[] = $search->compare( '>=', 'customer.state', '' ); |
|
| 165 | - $expr[] = $search->compare( '!=', 'customer.languageid', null ); |
|
| 166 | - $expr[] = $search->compare( '>=', 'customer.countryid', '' ); |
|
| 167 | - $expr[] = $search->compare( '>=', 'customer.telephone', '' ); |
|
| 168 | - $expr[] = $search->compare( '>=', 'customer.email', '' ); |
|
| 169 | - $expr[] = $search->compare( '>=', 'customer.telefax', '' ); |
|
| 170 | - $expr[] = $search->compare( '>=', 'customer.website', '' ); |
|
| 171 | - |
|
| 172 | - $expr[] = $search->compare( '==', 'customer.birthday', '1970-01-01' ); |
|
| 173 | - $expr[] = $search->compare( '>=', 'customer.password', '' ); |
|
| 174 | - $expr[] = $search->compare( '==', 'customer.status', 0 ); |
|
| 175 | - $expr[] = $search->compare( '!=', 'customer.mtime', '1970-01-01 00:00:00' ); |
|
| 176 | - $expr[] = $search->compare( '!=', 'customer.ctime', '1970-01-01 00:00:00' ); |
|
| 177 | - $expr[] = $search->compare( '==', 'customer.editor', $this->editor ); |
|
| 178 | - |
|
| 179 | - $expr[] = $search->compare( '!=', 'customer.address.id', null ); |
|
| 180 | - $expr[] = $search->compare( '!=', 'customer.address.parentid', null ); |
|
| 181 | - $expr[] = $search->compare( '==', 'customer.address.company', 'ABC GmbH' ); |
|
| 182 | - $expr[] = $search->compare( '==', 'customer.address.vatid', 'DE999999999' ); |
|
| 183 | - $expr[] = $search->compare( '==', 'customer.address.salutation', 'mr' ); |
|
| 184 | - $expr[] = $search->compare( '==', 'customer.address.title', 'Dr.' ); |
|
| 185 | - $expr[] = $search->compare( '==', 'customer.address.firstname', 'Good' ); |
|
| 186 | - $expr[] = $search->compare( '==', 'customer.address.lastname', 'Unittest' ); |
|
| 187 | - $expr[] = $search->compare( '==', 'customer.address.address1', 'Pickhuben' ); |
|
| 188 | - $expr[] = $search->compare( '==', 'customer.address.address2', '2-4' ); |
|
| 189 | - $expr[] = $search->compare( '==', 'customer.address.address3', '' ); |
|
| 190 | - $expr[] = $search->compare( '==', 'customer.address.postal', '11099' ); |
|
| 191 | - $expr[] = $search->compare( '==', 'customer.address.city', 'Berlin' ); |
|
| 192 | - $expr[] = $search->compare( '==', 'customer.address.state', 'Berlin' ); |
|
| 193 | - $expr[] = $search->compare( '==', 'customer.address.languageid', 'de' ); |
|
| 194 | - $expr[] = $search->compare( '==', 'customer.address.countryid', 'DE' ); |
|
| 195 | - $expr[] = $search->compare( '==', 'customer.address.telephone', '055544332221' ); |
|
| 196 | - $expr[] = $search->compare( '==', 'customer.address.email', '[email protected]' ); |
|
| 197 | - $expr[] = $search->compare( '==', 'customer.address.telefax', '055544333212' ); |
|
| 198 | - $expr[] = $search->compare( '==', 'customer.address.website', 'unittest.aimeos.org' ); |
|
| 199 | - $expr[] = $search->compare( '==', 'customer.address.flag', 0 ); |
|
| 200 | - $expr[] = $search->compare( '==', 'customer.address.position', 1 ); |
|
| 201 | - $expr[] = $search->compare( '!=', 'customer.address.mtime', '1970-01-01 00:00:00' ); |
|
| 202 | - $expr[] = $search->compare( '!=', 'customer.address.ctime', '1970-01-01 00:00:00' ); |
|
| 203 | - $expr[] = $search->compare( '==', 'customer.address.editor', $this->editor ); |
|
| 204 | - |
|
| 205 | - $search->setConditions( $search->combine( '&&', $expr ) ); |
|
| 206 | - $result = $this->object->searchItems( $search, array(), $total ); |
|
| 207 | - $this->assertEquals( 1, count( $result ) ); |
|
| 149 | + $expr[] = $search->compare('!=', 'customer.id', null); |
|
| 150 | + $expr[] = $search->compare('==', 'customer.label', 'Erika Mustermann'); |
|
| 151 | + $expr[] = $search->compare('==', 'customer.code', 'unitCustomer2'); |
|
| 152 | + |
|
| 153 | + $expr[] = $search->compare('>=', 'customer.salutation', ''); |
|
| 154 | + $expr[] = $search->compare('>=', 'customer.company', ''); |
|
| 155 | + $expr[] = $search->compare('>=', 'customer.vatid', ''); |
|
| 156 | + $expr[] = $search->compare('>=', 'customer.title', ''); |
|
| 157 | + $expr[] = $search->compare('>=', 'customer.firstname', ''); |
|
| 158 | + $expr[] = $search->compare('>=', 'customer.lastname', ''); |
|
| 159 | + $expr[] = $search->compare('>=', 'customer.address1', ''); |
|
| 160 | + $expr[] = $search->compare('>=', 'customer.address2', ''); |
|
| 161 | + $expr[] = $search->compare('>=', 'customer.address3', ''); |
|
| 162 | + $expr[] = $search->compare('>=', 'customer.postal', ''); |
|
| 163 | + $expr[] = $search->compare('>=', 'customer.city', ''); |
|
| 164 | + $expr[] = $search->compare('>=', 'customer.state', ''); |
|
| 165 | + $expr[] = $search->compare('!=', 'customer.languageid', null); |
|
| 166 | + $expr[] = $search->compare('>=', 'customer.countryid', ''); |
|
| 167 | + $expr[] = $search->compare('>=', 'customer.telephone', ''); |
|
| 168 | + $expr[] = $search->compare('>=', 'customer.email', ''); |
|
| 169 | + $expr[] = $search->compare('>=', 'customer.telefax', ''); |
|
| 170 | + $expr[] = $search->compare('>=', 'customer.website', ''); |
|
| 171 | + |
|
| 172 | + $expr[] = $search->compare('==', 'customer.birthday', '1970-01-01'); |
|
| 173 | + $expr[] = $search->compare('>=', 'customer.password', ''); |
|
| 174 | + $expr[] = $search->compare('==', 'customer.status', 0); |
|
| 175 | + $expr[] = $search->compare('!=', 'customer.mtime', '1970-01-01 00:00:00'); |
|
| 176 | + $expr[] = $search->compare('!=', 'customer.ctime', '1970-01-01 00:00:00'); |
|
| 177 | + $expr[] = $search->compare('==', 'customer.editor', $this->editor); |
|
| 178 | + |
|
| 179 | + $expr[] = $search->compare('!=', 'customer.address.id', null); |
|
| 180 | + $expr[] = $search->compare('!=', 'customer.address.parentid', null); |
|
| 181 | + $expr[] = $search->compare('==', 'customer.address.company', 'ABC GmbH'); |
|
| 182 | + $expr[] = $search->compare('==', 'customer.address.vatid', 'DE999999999'); |
|
| 183 | + $expr[] = $search->compare('==', 'customer.address.salutation', 'mr'); |
|
| 184 | + $expr[] = $search->compare('==', 'customer.address.title', 'Dr.'); |
|
| 185 | + $expr[] = $search->compare('==', 'customer.address.firstname', 'Good'); |
|
| 186 | + $expr[] = $search->compare('==', 'customer.address.lastname', 'Unittest'); |
|
| 187 | + $expr[] = $search->compare('==', 'customer.address.address1', 'Pickhuben'); |
|
| 188 | + $expr[] = $search->compare('==', 'customer.address.address2', '2-4'); |
|
| 189 | + $expr[] = $search->compare('==', 'customer.address.address3', ''); |
|
| 190 | + $expr[] = $search->compare('==', 'customer.address.postal', '11099'); |
|
| 191 | + $expr[] = $search->compare('==', 'customer.address.city', 'Berlin'); |
|
| 192 | + $expr[] = $search->compare('==', 'customer.address.state', 'Berlin'); |
|
| 193 | + $expr[] = $search->compare('==', 'customer.address.languageid', 'de'); |
|
| 194 | + $expr[] = $search->compare('==', 'customer.address.countryid', 'DE'); |
|
| 195 | + $expr[] = $search->compare('==', 'customer.address.telephone', '055544332221'); |
|
| 196 | + $expr[] = $search->compare('==', 'customer.address.email', '[email protected]'); |
|
| 197 | + $expr[] = $search->compare('==', 'customer.address.telefax', '055544333212'); |
|
| 198 | + $expr[] = $search->compare('==', 'customer.address.website', 'unittest.aimeos.org'); |
|
| 199 | + $expr[] = $search->compare('==', 'customer.address.flag', 0); |
|
| 200 | + $expr[] = $search->compare('==', 'customer.address.position', 1); |
|
| 201 | + $expr[] = $search->compare('!=', 'customer.address.mtime', '1970-01-01 00:00:00'); |
|
| 202 | + $expr[] = $search->compare('!=', 'customer.address.ctime', '1970-01-01 00:00:00'); |
|
| 203 | + $expr[] = $search->compare('==', 'customer.address.editor', $this->editor); |
|
| 204 | + |
|
| 205 | + $search->setConditions($search->combine('&&', $expr)); |
|
| 206 | + $result = $this->object->searchItems($search, array(), $total); |
|
| 207 | + $this->assertEquals(1, count($result)); |
|
| 208 | 208 | } |
| 209 | 209 | |
| 210 | 210 | |
@@ -213,44 +213,44 @@ discard block |
||
| 213 | 213 | $total = 0; |
| 214 | 214 | |
| 215 | 215 | $search = $this->object->createSearch(); |
| 216 | - $search->setConditions( $search->compare( '==', 'customer.address.editor', $this->editor ) ); |
|
| 217 | - $search->setSlice( 0, 2 ); |
|
| 216 | + $search->setConditions($search->compare('==', 'customer.address.editor', $this->editor)); |
|
| 217 | + $search->setSlice(0, 2); |
|
| 218 | 218 | |
| 219 | - $results = $this->object->searchItems( $search, array(), $total ); |
|
| 220 | - $this->assertEquals( 2, count( $results ) ); |
|
| 221 | - $this->assertEquals( 3, $total ); |
|
| 219 | + $results = $this->object->searchItems($search, array(), $total); |
|
| 220 | + $this->assertEquals(2, count($results)); |
|
| 221 | + $this->assertEquals(3, $total); |
|
| 222 | 222 | |
| 223 | - foreach($results as $itemId => $item) { |
|
| 224 | - $this->assertEquals( $itemId, $item->getId() ); |
|
| 223 | + foreach ($results as $itemId => $item) { |
|
| 224 | + $this->assertEquals($itemId, $item->getId()); |
|
| 225 | 225 | } |
| 226 | 226 | } |
| 227 | 227 | |
| 228 | 228 | |
| 229 | 229 | public function testSearchItemsBaseCriteria() |
| 230 | 230 | { |
| 231 | - $search = $this->object->createSearch( true ); |
|
| 231 | + $search = $this->object->createSearch(true); |
|
| 232 | 232 | $conditions = array( |
| 233 | - $search->compare( '==', 'customer.address.editor', $this->editor ), |
|
| 233 | + $search->compare('==', 'customer.address.editor', $this->editor), |
|
| 234 | 234 | $search->getConditions() |
| 235 | 235 | ); |
| 236 | - $search->setConditions( $search->combine( '&&', $conditions ) ); |
|
| 237 | - $this->assertEquals( 2, count( $this->object->searchItems( $search, array(), $total ) ) ); |
|
| 236 | + $search->setConditions($search->combine('&&', $conditions)); |
|
| 237 | + $this->assertEquals(2, count($this->object->searchItems($search, array(), $total))); |
|
| 238 | 238 | } |
| 239 | 239 | |
| 240 | 240 | |
| 241 | 241 | public function testGetSubManager() |
| 242 | 242 | { |
| 243 | - $this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager( 'address' ) ); |
|
| 244 | - $this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager( 'address', 'Standard' ) ); |
|
| 243 | + $this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager('address')); |
|
| 244 | + $this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager('address', 'Standard')); |
|
| 245 | 245 | |
| 246 | - $this->setExpectedException( '\\Aimeos\\MShop\\Exception' ); |
|
| 247 | - $this->object->getSubManager( 'unknown' ); |
|
| 246 | + $this->setExpectedException('\\Aimeos\\MShop\\Exception'); |
|
| 247 | + $this->object->getSubManager('unknown'); |
|
| 248 | 248 | } |
| 249 | 249 | |
| 250 | 250 | |
| 251 | 251 | public function testGetSubManagerInvalidName() |
| 252 | 252 | { |
| 253 | - $this->setExpectedException( '\\Aimeos\\MShop\\Exception' ); |
|
| 254 | - $this->object->getSubManager( 'address', 'unknown' ); |
|
| 253 | + $this->setExpectedException('\\Aimeos\\MShop\\Exception'); |
|
| 254 | + $this->object->getSubManager('address', 'unknown'); |
|
| 255 | 255 | } |
| 256 | 256 | } |
@@ -20,12 +20,12 @@ discard block |
||
| 20 | 20 | */ |
| 21 | 21 | protected function setUp() |
| 22 | 22 | { |
| 23 | - if( interface_exists( '\\Illuminate\\Contracts\\Logging\\Log' ) === false ) { |
|
| 24 | - $this->markTestSkipped( 'Class \\Illuminate\\Contracts\\Logging\\Log not found' ); |
|
| 23 | + if (interface_exists('\\Illuminate\\Contracts\\Logging\\Log') === false) { |
|
| 24 | + $this->markTestSkipped('Class \\Illuminate\\Contracts\\Logging\\Log not found'); |
|
| 25 | 25 | } |
| 26 | 26 | |
| 27 | - $this->mock = $this->getMockBuilder( '\\Illuminate\\Contracts\\Logging\\Log' )->getMock(); |
|
| 28 | - $this->object = new \Aimeos\MW\Logger\Laravel5( $this->mock ); |
|
| 27 | + $this->mock = $this->getMockBuilder('\\Illuminate\\Contracts\\Logging\\Log')->getMock(); |
|
| 28 | + $this->object = new \Aimeos\MW\Logger\Laravel5($this->mock); |
|
| 29 | 29 | } |
| 30 | 30 | |
| 31 | 31 | |
@@ -37,42 +37,42 @@ discard block |
||
| 37 | 37 | */ |
| 38 | 38 | protected function tearDown() |
| 39 | 39 | { |
| 40 | - unset( $this->mock, $this->object ); |
|
| 40 | + unset($this->mock, $this->object); |
|
| 41 | 41 | } |
| 42 | 42 | |
| 43 | 43 | |
| 44 | 44 | public function testLog() |
| 45 | 45 | { |
| 46 | - $this->mock->expects( $this->once() )->method( 'log' ) |
|
| 47 | - ->with( $this->equalTo( 'msg' ), $this->equalTo( 'error' ) ); |
|
| 48 | - $this->object->log( 'msg' ); |
|
| 46 | + $this->mock->expects($this->once())->method('log') |
|
| 47 | + ->with($this->equalTo('msg'), $this->equalTo('error')); |
|
| 48 | + $this->object->log('msg'); |
|
| 49 | 49 | } |
| 50 | 50 | |
| 51 | 51 | |
| 52 | 52 | public function testNonScalarLog() |
| 53 | 53 | { |
| 54 | - $this->mock->expects( $this->once() )->method( 'log' ) |
|
| 55 | - ->with( $this->equalTo( '["error","error2",2]' ), $this->equalTo( 'error' ) ); |
|
| 56 | - $this->object->log( array( 'error', 'error2', 2 ) ); |
|
| 54 | + $this->mock->expects($this->once())->method('log') |
|
| 55 | + ->with($this->equalTo('["error","error2",2]'), $this->equalTo('error')); |
|
| 56 | + $this->object->log(array('error', 'error2', 2)); |
|
| 57 | 57 | } |
| 58 | 58 | |
| 59 | 59 | |
| 60 | 60 | public function testLogDebug() |
| 61 | 61 | { |
| 62 | - $this->object->log( 'emergency', \Aimeos\MW\Logger\Base::EMERG ); |
|
| 63 | - $this->object->log( 'alert', \Aimeos\MW\Logger\Base::ALERT ); |
|
| 64 | - $this->object->log( 'critical', \Aimeos\MW\Logger\Base::CRIT ); |
|
| 65 | - $this->object->log( 'error', \Aimeos\MW\Logger\Base::ERR ); |
|
| 66 | - $this->object->log( 'warning', \Aimeos\MW\Logger\Base::WARN ); |
|
| 67 | - $this->object->log( 'notice', \Aimeos\MW\Logger\Base::NOTICE ); |
|
| 68 | - $this->object->log( 'info', \Aimeos\MW\Logger\Base::INFO ); |
|
| 69 | - $this->object->log( 'debug', \Aimeos\MW\Logger\Base::DEBUG ); |
|
| 62 | + $this->object->log('emergency', \Aimeos\MW\Logger\Base::EMERG); |
|
| 63 | + $this->object->log('alert', \Aimeos\MW\Logger\Base::ALERT); |
|
| 64 | + $this->object->log('critical', \Aimeos\MW\Logger\Base::CRIT); |
|
| 65 | + $this->object->log('error', \Aimeos\MW\Logger\Base::ERR); |
|
| 66 | + $this->object->log('warning', \Aimeos\MW\Logger\Base::WARN); |
|
| 67 | + $this->object->log('notice', \Aimeos\MW\Logger\Base::NOTICE); |
|
| 68 | + $this->object->log('info', \Aimeos\MW\Logger\Base::INFO); |
|
| 69 | + $this->object->log('debug', \Aimeos\MW\Logger\Base::DEBUG); |
|
| 70 | 70 | } |
| 71 | 71 | |
| 72 | 72 | |
| 73 | 73 | public function testBadPriority() |
| 74 | 74 | { |
| 75 | - $this->setExpectedException( '\\Aimeos\\MW\\Logger\\Exception' ); |
|
| 76 | - $this->object->log( 'error', -1 ); |
|
| 75 | + $this->setExpectedException('\\Aimeos\\MW\\Logger\\Exception'); |
|
| 76 | + $this->object->log('error', -1); |
|
| 77 | 77 | } |
| 78 | 78 | } |