Completed
Push — master ( 48911b...505646 )
by Aimeos
02:27
created
lib/custom/tests/MW/View/Helper/Request/Laravel5Test.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -17,42 +17,42 @@
 block discarded – undo
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
 }
Please login to merge, or discard this patch.
lib/custom/tests/MW/View/Helper/Response/Laravel5Test.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -17,27 +17,27 @@
 block discarded – undo
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
 }
Please login to merge, or discard this patch.
lib/custom/src/MW/View/Helper/Request/Laravel5.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -34,11 +34,11 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 
Please login to merge, or discard this patch.