@@ -21,29 +21,29 @@ discard block |
||
| 21 | 21 | $this->context = \TestHelperJadm::getContext(); |
| 22 | 22 | $this->view = $this->context->getView(); |
| 23 | 23 | |
| 24 | - $this->client = new \Aimeos\Admin\JsonAdm\Product\Standard( $this->context, $this->view, [], '' ); |
|
| 24 | + $this->client = new \Aimeos\Admin\JsonAdm\Product\Standard($this->context, $this->view, [], ''); |
|
| 25 | 25 | |
| 26 | - $this->object = $this->getMockBuilder( '\Aimeos\Admin\JsonAdm\Common\Factory\Base' ) |
|
| 26 | + $this->object = $this->getMockBuilder('\Aimeos\Admin\JsonAdm\Common\Factory\Base') |
|
| 27 | 27 | ->getMockForAbstractClass(); |
| 28 | 28 | } |
| 29 | 29 | |
| 30 | 30 | |
| 31 | 31 | public function testinjectClient() |
| 32 | 32 | { |
| 33 | - $this->object->injectClient( 'test', $this->client ); |
|
| 33 | + $this->object->injectClient('test', $this->client); |
|
| 34 | 34 | } |
| 35 | 35 | |
| 36 | 36 | |
| 37 | 37 | public function testAddClientDecorators() |
| 38 | 38 | { |
| 39 | 39 | $config = $this->context->getConfig(); |
| 40 | - $config->set( 'client/jsonapi/common/decorators/default', ['Test'] ); |
|
| 41 | - $config->set( 'client/jsonapi/product/decorators/excludes', ['Test'] ); |
|
| 40 | + $config->set('client/jsonapi/common/decorators/default', ['Test']); |
|
| 41 | + $config->set('client/jsonapi/product/decorators/excludes', ['Test']); |
|
| 42 | 42 | |
| 43 | 43 | $params = [$this->client, $this->context, $this->view, [], 'product']; |
| 44 | - $result = $this->access( 'addClientDecorators' )->invokeArgs( $this->object, $params ); |
|
| 44 | + $result = $this->access('addClientDecorators')->invokeArgs($this->object, $params); |
|
| 45 | 45 | |
| 46 | - $this->assertInstanceOf( '\Aimeos\\Admin\\JsonAdm\\Iface', $result ); |
|
| 46 | + $this->assertInstanceOf('\Aimeos\\Admin\\JsonAdm\\Iface', $result); |
|
| 47 | 47 | } |
| 48 | 48 | |
| 49 | 49 | |
@@ -52,9 +52,9 @@ discard block |
||
| 52 | 52 | $prefix = '\Aimeos\\Admin\\JsonAdm\\Common\\Decorator\\'; |
| 53 | 53 | $params = [$this->client, ['Example'], $prefix, $this->context, $this->view, [], '']; |
| 54 | 54 | |
| 55 | - $result = $this->access( 'addDecorators' )->invokeArgs( $this->object, $params ); |
|
| 55 | + $result = $this->access('addDecorators')->invokeArgs($this->object, $params); |
|
| 56 | 56 | |
| 57 | - $this->assertInstanceOf( '\Aimeos\\Admin\\JsonAdm\\Iface', $result ); |
|
| 57 | + $this->assertInstanceOf('\Aimeos\\Admin\\JsonAdm\\Iface', $result); |
|
| 58 | 58 | } |
| 59 | 59 | |
| 60 | 60 | |
@@ -63,8 +63,8 @@ discard block |
||
| 63 | 63 | $prefix = '\Aimeos\\Admin\\JsonAdm\\Common\\Decorator\\'; |
| 64 | 64 | $params = [$this->client, ['Test'], $prefix, $this->context, $this->view, [], '']; |
| 65 | 65 | |
| 66 | - $this->expectException( '\Aimeos\Admin\JsonAdm\Exception' ); |
|
| 67 | - $this->access( 'addDecorators' )->invokeArgs( $this->object, $params ); |
|
| 66 | + $this->expectException('\Aimeos\Admin\JsonAdm\Exception'); |
|
| 67 | + $this->access('addDecorators')->invokeArgs($this->object, $params); |
|
| 68 | 68 | } |
| 69 | 69 | |
| 70 | 70 | |
@@ -73,8 +73,8 @@ discard block |
||
| 73 | 73 | $prefix = '\Aimeos\\Admin\\JsonAdm\\Common\\Decorator\\'; |
| 74 | 74 | $params = [$this->client, [''], $prefix, $this->context, $this->view, [], '']; |
| 75 | 75 | |
| 76 | - $this->expectException( '\Aimeos\Admin\JsonAdm\Exception' ); |
|
| 77 | - $this->access( 'addDecorators' )->invokeArgs( $this->object, $params ); |
|
| 76 | + $this->expectException('\Aimeos\Admin\JsonAdm\Exception'); |
|
| 77 | + $this->access('addDecorators')->invokeArgs($this->object, $params); |
|
| 78 | 78 | } |
| 79 | 79 | |
| 80 | 80 | |
@@ -84,9 +84,9 @@ discard block |
||
| 84 | 84 | $class = '\Aimeos\\Admin\\JsonAdm\\Product\\Standard'; |
| 85 | 85 | $params = [$class, $iface, $this->context, $this->view, [], '']; |
| 86 | 86 | |
| 87 | - $result = $this->access( 'createClientBase' )->invokeArgs( $this->object, $params ); |
|
| 87 | + $result = $this->access('createClientBase')->invokeArgs($this->object, $params); |
|
| 88 | 88 | |
| 89 | - $this->assertInstanceOf( '\Aimeos\\Admin\\JsonAdm\\Iface', $result ); |
|
| 89 | + $this->assertInstanceOf('\Aimeos\\Admin\\JsonAdm\\Iface', $result); |
|
| 90 | 90 | } |
| 91 | 91 | |
| 92 | 92 | |
@@ -95,10 +95,10 @@ discard block |
||
| 95 | 95 | $iface = '\Aimeos\\Admin\\JsonAdm\\Iface'; |
| 96 | 96 | $params = ['test', $iface, $this->context, $this->view, [], '']; |
| 97 | 97 | |
| 98 | - $this->object->injectClient( 'test', $this->client ); |
|
| 99 | - $result = $this->access( 'createClientBase' )->invokeArgs( $this->object, $params ); |
|
| 98 | + $this->object->injectClient('test', $this->client); |
|
| 99 | + $result = $this->access('createClientBase')->invokeArgs($this->object, $params); |
|
| 100 | 100 | |
| 101 | - $this->assertSame( $this->client, $result ); |
|
| 101 | + $this->assertSame($this->client, $result); |
|
| 102 | 102 | } |
| 103 | 103 | |
| 104 | 104 | |
@@ -107,8 +107,8 @@ discard block |
||
| 107 | 107 | $iface = '\Aimeos\\Admin\\JsonAdm\\Iface'; |
| 108 | 108 | $params = ['invalid', $iface, $this->context, $this->view, [], '']; |
| 109 | 109 | |
| 110 | - $this->expectException( '\Aimeos\Admin\JsonAdm\Exception' ); |
|
| 111 | - $this->access( 'createClientBase' )->invokeArgs( $this->object, $params ); |
|
| 110 | + $this->expectException('\Aimeos\Admin\JsonAdm\Exception'); |
|
| 111 | + $this->access('createClientBase')->invokeArgs($this->object, $params); |
|
| 112 | 112 | } |
| 113 | 113 | |
| 114 | 114 | |
@@ -118,16 +118,16 @@ discard block |
||
| 118 | 118 | $class = '\Aimeos\\Admin\\JsonAdm\\Product\\Standard'; |
| 119 | 119 | $params = [$class, $iface, $this->context, $this->view, [], '']; |
| 120 | 120 | |
| 121 | - $this->expectException( '\Aimeos\Admin\JsonAdm\Exception' ); |
|
| 122 | - $this->access( 'createClientBase' )->invokeArgs( $this->object, $params ); |
|
| 121 | + $this->expectException('\Aimeos\Admin\JsonAdm\Exception'); |
|
| 122 | + $this->access('createClientBase')->invokeArgs($this->object, $params); |
|
| 123 | 123 | } |
| 124 | 124 | |
| 125 | 125 | |
| 126 | - protected function access( $name ) |
|
| 126 | + protected function access($name) |
|
| 127 | 127 | { |
| 128 | - $class = new \ReflectionClass( '\Aimeos\Admin\JsonAdm\Common\Factory\Base' ); |
|
| 129 | - $method = $class->getMethod( $name ); |
|
| 130 | - $method->setAccessible( true ); |
|
| 128 | + $class = new \ReflectionClass('\Aimeos\Admin\JsonAdm\Common\Factory\Base'); |
|
| 129 | + $method = $class->getMethod($name); |
|
| 130 | + $method->setAccessible(true); |
|
| 131 | 131 | |
| 132 | 132 | return $method; |
| 133 | 133 | } |
@@ -16,8 +16,8 @@ discard block |
||
| 16 | 16 | $context = \TestHelperJadm::getContext(); |
| 17 | 17 | $templatePaths = \TestHelperJadm::getJsonadmPaths(); |
| 18 | 18 | |
| 19 | - $client = \Aimeos\Admin\JsonAdm\Factory::createClient( $context, $templatePaths, 'order' ); |
|
| 20 | - $this->assertInstanceOf( '\\Aimeos\\Admin\\JsonAdm\\Common\\Iface', $client ); |
|
| 19 | + $client = \Aimeos\Admin\JsonAdm\Factory::createClient($context, $templatePaths, 'order'); |
|
| 20 | + $this->assertInstanceOf('\\Aimeos\\Admin\\JsonAdm\\Common\\Iface', $client); |
|
| 21 | 21 | } |
| 22 | 22 | |
| 23 | 23 | |
@@ -26,8 +26,8 @@ discard block |
||
| 26 | 26 | $context = \TestHelperJadm::getContext(); |
| 27 | 27 | $templatePaths = \TestHelperJadm::getJsonadmPaths(); |
| 28 | 28 | |
| 29 | - $client = \Aimeos\Admin\JsonAdm\Factory::createClient( $context, $templatePaths, 'order/base' ); |
|
| 30 | - $this->assertInstanceOf( '\\Aimeos\\Admin\\JsonAdm\\Common\\Iface', $client ); |
|
| 29 | + $client = \Aimeos\Admin\JsonAdm\Factory::createClient($context, $templatePaths, 'order/base'); |
|
| 30 | + $this->assertInstanceOf('\\Aimeos\\Admin\\JsonAdm\\Common\\Iface', $client); |
|
| 31 | 31 | } |
| 32 | 32 | |
| 33 | 33 | |
@@ -36,8 +36,8 @@ discard block |
||
| 36 | 36 | $context = \TestHelperJadm::getContext(); |
| 37 | 37 | $templatePaths = \TestHelperJadm::getJsonadmPaths(); |
| 38 | 38 | |
| 39 | - $client = \Aimeos\Admin\JsonAdm\Factory::createClient( $context, $templatePaths, '' ); |
|
| 40 | - $this->assertInstanceOf( '\\Aimeos\\Admin\\JsonAdm\\Common\\Iface', $client ); |
|
| 39 | + $client = \Aimeos\Admin\JsonAdm\Factory::createClient($context, $templatePaths, ''); |
|
| 40 | + $this->assertInstanceOf('\\Aimeos\\Admin\\JsonAdm\\Common\\Iface', $client); |
|
| 41 | 41 | } |
| 42 | 42 | |
| 43 | 43 | |
@@ -46,8 +46,8 @@ discard block |
||
| 46 | 46 | $context = \TestHelperJadm::getContext(); |
| 47 | 47 | $templatePaths = \TestHelperJadm::getJsonadmPaths(); |
| 48 | 48 | |
| 49 | - $this->expectException( '\\Aimeos\\Admin\\JsonAdm\\Exception' ); |
|
| 50 | - \Aimeos\Admin\JsonAdm\Factory::createClient( $context, $templatePaths, '%^' ); |
|
| 49 | + $this->expectException('\\Aimeos\\Admin\\JsonAdm\\Exception'); |
|
| 50 | + \Aimeos\Admin\JsonAdm\Factory::createClient($context, $templatePaths, '%^'); |
|
| 51 | 51 | } |
| 52 | 52 | |
| 53 | 53 | |
@@ -56,68 +56,68 @@ discard block |
||
| 56 | 56 | $context = \TestHelperJadm::getContext(); |
| 57 | 57 | $templatePaths = \TestHelperJadm::getJsonadmPaths(); |
| 58 | 58 | |
| 59 | - $this->expectException( '\\Aimeos\\Admin\\JsonAdm\\Exception' ); |
|
| 60 | - \Aimeos\Admin\JsonAdm\Factory::createClient( $context, $templatePaths, '', '%^' ); |
|
| 59 | + $this->expectException('\\Aimeos\\Admin\\JsonAdm\\Exception'); |
|
| 60 | + \Aimeos\Admin\JsonAdm\Factory::createClient($context, $templatePaths, '', '%^'); |
|
| 61 | 61 | } |
| 62 | 62 | |
| 63 | 63 | |
| 64 | 64 | public function testClear() |
| 65 | 65 | { |
| 66 | - $cache = \Aimeos\Admin\JsonAdm\Factory::setCache( true ); |
|
| 66 | + $cache = \Aimeos\Admin\JsonAdm\Factory::setCache(true); |
|
| 67 | 67 | |
| 68 | 68 | $context = \TestHelperJadm::getContext(); |
| 69 | 69 | $templatePaths = \TestHelperJadm::getJsonadmPaths(); |
| 70 | 70 | |
| 71 | - $client1 = \Aimeos\Admin\JsonAdm\Factory::createClient( $context, $templatePaths, 'order' ); |
|
| 71 | + $client1 = \Aimeos\Admin\JsonAdm\Factory::createClient($context, $templatePaths, 'order'); |
|
| 72 | 72 | \Aimeos\Admin\JsonAdm\Factory::clear(); |
| 73 | - $client2 = \Aimeos\Admin\JsonAdm\Factory::createClient( $context, $templatePaths, 'order' ); |
|
| 73 | + $client2 = \Aimeos\Admin\JsonAdm\Factory::createClient($context, $templatePaths, 'order'); |
|
| 74 | 74 | |
| 75 | - \Aimeos\Admin\JsonAdm\Factory::setCache( $cache ); |
|
| 75 | + \Aimeos\Admin\JsonAdm\Factory::setCache($cache); |
|
| 76 | 76 | |
| 77 | - $this->assertNotSame( $client1, $client2 ); |
|
| 77 | + $this->assertNotSame($client1, $client2); |
|
| 78 | 78 | } |
| 79 | 79 | |
| 80 | 80 | |
| 81 | 81 | public function testClearSite() |
| 82 | 82 | { |
| 83 | - $cache = \Aimeos\Admin\JsonAdm\Factory::setCache( true ); |
|
| 83 | + $cache = \Aimeos\Admin\JsonAdm\Factory::setCache(true); |
|
| 84 | 84 | |
| 85 | 85 | $context = \TestHelperJadm::getContext(); |
| 86 | 86 | $templatePaths = \TestHelperJadm::getJsonadmPaths(); |
| 87 | 87 | |
| 88 | - $cntlA1 = \Aimeos\Admin\JsonAdm\Factory::createClient( $context, $templatePaths, 'order' ); |
|
| 89 | - $cntlB1 = \Aimeos\Admin\JsonAdm\Factory::createClient( $context, $templatePaths, 'order/base' ); |
|
| 90 | - \Aimeos\Admin\JsonAdm\Factory::clear( (string) $context ); |
|
| 88 | + $cntlA1 = \Aimeos\Admin\JsonAdm\Factory::createClient($context, $templatePaths, 'order'); |
|
| 89 | + $cntlB1 = \Aimeos\Admin\JsonAdm\Factory::createClient($context, $templatePaths, 'order/base'); |
|
| 90 | + \Aimeos\Admin\JsonAdm\Factory::clear((string) $context); |
|
| 91 | 91 | |
| 92 | - $cntlA2 = \Aimeos\Admin\JsonAdm\Factory::createClient( $context, $templatePaths, 'order' ); |
|
| 93 | - $cntlB2 = \Aimeos\Admin\JsonAdm\Factory::createClient( $context, $templatePaths, 'order/base' ); |
|
| 92 | + $cntlA2 = \Aimeos\Admin\JsonAdm\Factory::createClient($context, $templatePaths, 'order'); |
|
| 93 | + $cntlB2 = \Aimeos\Admin\JsonAdm\Factory::createClient($context, $templatePaths, 'order/base'); |
|
| 94 | 94 | |
| 95 | - \Aimeos\Admin\JsonAdm\Factory::setCache( $cache ); |
|
| 95 | + \Aimeos\Admin\JsonAdm\Factory::setCache($cache); |
|
| 96 | 96 | |
| 97 | - $this->assertNotSame( $cntlA1, $cntlA2 ); |
|
| 98 | - $this->assertNotSame( $cntlB1, $cntlB2 ); |
|
| 97 | + $this->assertNotSame($cntlA1, $cntlA2); |
|
| 98 | + $this->assertNotSame($cntlB1, $cntlB2); |
|
| 99 | 99 | } |
| 100 | 100 | |
| 101 | 101 | |
| 102 | 102 | public function testClearSpecific() |
| 103 | 103 | { |
| 104 | - $cache = \Aimeos\Admin\JsonAdm\Factory::setCache( true ); |
|
| 104 | + $cache = \Aimeos\Admin\JsonAdm\Factory::setCache(true); |
|
| 105 | 105 | |
| 106 | 106 | $context = \TestHelperJadm::getContext(); |
| 107 | 107 | $templatePaths = \TestHelperJadm::getJsonadmPaths(); |
| 108 | 108 | |
| 109 | - $cntlA1 = \Aimeos\Admin\JsonAdm\Factory::createClient( $context, $templatePaths, 'order' ); |
|
| 110 | - $cntlB1 = \Aimeos\Admin\JsonAdm\Factory::createClient( $context, $templatePaths, 'order/base' ); |
|
| 109 | + $cntlA1 = \Aimeos\Admin\JsonAdm\Factory::createClient($context, $templatePaths, 'order'); |
|
| 110 | + $cntlB1 = \Aimeos\Admin\JsonAdm\Factory::createClient($context, $templatePaths, 'order/base'); |
|
| 111 | 111 | |
| 112 | - \Aimeos\Admin\JsonAdm\Factory::clear( (string) $context, 'order' ); |
|
| 112 | + \Aimeos\Admin\JsonAdm\Factory::clear((string) $context, 'order'); |
|
| 113 | 113 | |
| 114 | - $cntlA2 = \Aimeos\Admin\JsonAdm\Factory::createClient( $context, $templatePaths, 'order' ); |
|
| 115 | - $cntlB2 = \Aimeos\Admin\JsonAdm\Factory::createClient( $context, $templatePaths, 'order/base' ); |
|
| 114 | + $cntlA2 = \Aimeos\Admin\JsonAdm\Factory::createClient($context, $templatePaths, 'order'); |
|
| 115 | + $cntlB2 = \Aimeos\Admin\JsonAdm\Factory::createClient($context, $templatePaths, 'order/base'); |
|
| 116 | 116 | |
| 117 | - \Aimeos\Admin\JsonAdm\Factory::setCache( $cache ); |
|
| 117 | + \Aimeos\Admin\JsonAdm\Factory::setCache($cache); |
|
| 118 | 118 | |
| 119 | - $this->assertNotSame( $cntlA1, $cntlA2 ); |
|
| 120 | - $this->assertSame( $cntlB1, $cntlB2 ); |
|
| 119 | + $this->assertNotSame($cntlA1, $cntlA2); |
|
| 120 | + $this->assertSame($cntlB1, $cntlB2); |
|
| 121 | 121 | } |
| 122 | 122 | |
| 123 | 123 | } |
| 124 | 124 | \ No newline at end of file |