@@ -98,7 +98,8 @@ |
||
98 | 98 | * @param int $severity Optional severity, must be either of one of \TYPO3\CMS\Core\Messaging\FlashMessage constants |
99 | 99 | * @param bool $storeInSession Optional, defines whether the message should be stored in the session or only for one request (default) |
100 | 100 | * @param string $identifier Queue-identifier |
101 | - * @param string $className name of the class to instantiate, defaults to \TYPO3\CMS\Core\Messaging\FlashMessage |
|
101 | + * @param string $className name of the class to instantiate, defaults to \TYPO3\CMS\Core\Messaging\FlashMessage |
|
102 | + * @param string $extensionKey |
|
102 | 103 | * @return void |
103 | 104 | */ |
104 | 105 | public static function showFlashMessage($extensionKey, $message, $title = '', $severity = FlashMessage::OK, $storeInSession = true, $identifier = '', $className = '') |
@@ -27,8 +27,8 @@ |
||
27 | 27 | /** |
28 | 28 | * Use declarations |
29 | 29 | */ |
30 | -use TYPO3\CMS\Core\Messaging\FlashMessage; |
|
31 | -use TYPO3\CMS\Core\Messaging\FlashMessageService; |
|
30 | +use TYPO3\CMS\Core\Messaging\FlashMessage; |
|
31 | +use TYPO3\CMS\Core\Messaging\FlashMessageService; |
|
32 | 32 | use TYPO3\CMS\Core\Utility\GeneralUtility; |
33 | 33 | |
34 | 34 |
@@ -2,8 +2,8 @@ |
||
2 | 2 | namespace Gilbertsoft\Lib\Tests\Unit\Service; |
3 | 3 | |
4 | 4 | use Gilbertsoft\Lib\Tests\Unit\Fixtures\InstallService; |
5 | -use TYPO3\CMS\Core\Utility\GeneralUtility; |
|
6 | 5 | use TYPO3\CMS\Core\Tests\UnitTestCase; |
6 | +use TYPO3\CMS\Core\Utility\GeneralUtility; |
|
7 | 7 | |
8 | 8 | class InstallServiceTest extends UnitTestCase |
9 | 9 | { |
@@ -12,10 +12,10 @@ discard block |
||
12 | 12 | */ |
13 | 13 | protected $installService; |
14 | 14 | |
15 | - /** |
|
16 | - * @var string Extension key |
|
17 | - */ |
|
18 | - protected $extensionKey; |
|
15 | + /** |
|
16 | + * @var string Extension key |
|
17 | + */ |
|
18 | + protected $extensionKey; |
|
19 | 19 | |
20 | 20 | /** |
21 | 21 | * Returns a new InstallService instance. |
@@ -27,7 +27,7 @@ discard block |
||
27 | 27 | |
28 | 28 | protected function setUp() |
29 | 29 | { |
30 | - $this->extensionKey = $this->getUniqueId('foobar'); |
|
30 | + $this->extensionKey = $this->getUniqueId('foobar'); |
|
31 | 31 | $this->installService = $this->createInstallService($this->extensionKey); |
32 | 32 | } |
33 | 33 | |
@@ -52,7 +52,7 @@ discard block |
||
52 | 52 | /** |
53 | 53 | * @test |
54 | 54 | * @expectedException \InvalidArgumentException |
55 | - * @expectedExceptionCode 1491494798 |
|
55 | + * @expectedExceptionCode 1491494798 |
|
56 | 56 | */ |
57 | 57 | public function canNotBeCreatedWithExtensionKeyNull() |
58 | 58 | { |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | /** |
63 | 63 | * @test |
64 | 64 | * @expectedException \InvalidArgumentException |
65 | - * @expectedExceptionCode 1491494798 |
|
65 | + * @expectedExceptionCode 1491494798 |
|
66 | 66 | */ |
67 | 67 | public function canNotBeCreatedWithExtensionKeyEmpty() |
68 | 68 | { |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | /** |
73 | 73 | * @test |
74 | 74 | * @expectedException \InvalidArgumentException |
75 | - * @expectedExceptionCode 1491494798 |
|
75 | + * @expectedExceptionCode 1491494798 |
|
76 | 76 | */ |
77 | 77 | public function canNotBeCreatedWithExtensionKeyNumeric() |
78 | 78 | { |
@@ -3,8 +3,8 @@ |
||
3 | 3 | |
4 | 4 | class LoadableClass |
5 | 5 | { |
6 | - public function returnsTrue() |
|
7 | - { |
|
8 | - return true; |
|
9 | - } |
|
6 | + public function returnsTrue() |
|
7 | + { |
|
8 | + return true; |
|
9 | + } |
|
10 | 10 | } |
@@ -36,85 +36,85 @@ |
||
36 | 36 | */ |
37 | 37 | class RenderingTest extends FunctionalTestCase |
38 | 38 | { |
39 | - /** |
|
40 | - * @var array |
|
41 | - */ |
|
42 | - protected $testExtensionsToLoad = array('typo3conf/ext/gslib'); |
|
43 | - |
|
44 | - /** |
|
45 | - * @var array |
|
46 | - */ |
|
47 | - protected $coreExtensionsToLoad = array('fluid'); |
|
48 | - |
|
49 | - public function setUp() |
|
50 | - { |
|
51 | - parent::setUp(); |
|
52 | - $this->importDataSet(__DIR__ . '/Fixtures/Database/pages.xml'); |
|
53 | - $this->setUpFrontendRootPage(1, array('EXT:gslib/Tests/Functional/Fixtures/Frontend/Basic.ts')); |
|
54 | - } |
|
55 | - |
|
56 | - /** |
|
57 | - * @test |
|
58 | - */ |
|
59 | - public function emailViewHelperWorksWithSpamProtection() |
|
60 | - { |
|
61 | - $requestArguments = array('id' => '1'); |
|
62 | - $expectedContent = '<a href="javascript:linkTo_UnCryptMailto(\'ocknvq,varq5Bikndgtvuqhv0qti\');">typo3(AT)gilbertsoft(DOT)org</a>'; |
|
63 | - $this->assertSame($expectedContent, $this->fetchFrontendResponse($requestArguments)->getContent()); |
|
64 | - } |
|
65 | - |
|
66 | - |
|
67 | - |
|
68 | - /* *************** |
|
39 | + /** |
|
40 | + * @var array |
|
41 | + */ |
|
42 | + protected $testExtensionsToLoad = array('typo3conf/ext/gslib'); |
|
43 | + |
|
44 | + /** |
|
45 | + * @var array |
|
46 | + */ |
|
47 | + protected $coreExtensionsToLoad = array('fluid'); |
|
48 | + |
|
49 | + public function setUp() |
|
50 | + { |
|
51 | + parent::setUp(); |
|
52 | + $this->importDataSet(__DIR__ . '/Fixtures/Database/pages.xml'); |
|
53 | + $this->setUpFrontendRootPage(1, array('EXT:gslib/Tests/Functional/Fixtures/Frontend/Basic.ts')); |
|
54 | + } |
|
55 | + |
|
56 | + /** |
|
57 | + * @test |
|
58 | + */ |
|
59 | + public function emailViewHelperWorksWithSpamProtection() |
|
60 | + { |
|
61 | + $requestArguments = array('id' => '1'); |
|
62 | + $expectedContent = '<a href="javascript:linkTo_UnCryptMailto(\'ocknvq,varq5Bikndgtvuqhv0qti\');">typo3(AT)gilbertsoft(DOT)org</a>'; |
|
63 | + $this->assertSame($expectedContent, $this->fetchFrontendResponse($requestArguments)->getContent()); |
|
64 | + } |
|
65 | + |
|
66 | + |
|
67 | + |
|
68 | + /* *************** |
|
69 | 69 | * Utility methods |
70 | 70 | * ***************/ |
71 | 71 | |
72 | 72 | |
73 | 73 | |
74 | - /** |
|
75 | - * @param array $requestArguments |
|
76 | - * @param bool $failOnFailure |
|
77 | - * @return Response |
|
78 | - */ |
|
79 | - protected function fetchFrontendResponse(array $requestArguments, $failOnFailure = true) |
|
80 | - { |
|
81 | - if (!empty($requestArguments['url'])) { |
|
82 | - $requestUrl = '/' . ltrim($requestArguments['url'], '/'); |
|
83 | - } else { |
|
84 | - $requestUrl = '/?' . GeneralUtility::implodeArrayForUrl('', $requestArguments); |
|
85 | - } |
|
86 | - if (property_exists($this, 'instancePath')) { |
|
87 | - $instancePath = $this->instancePath; |
|
88 | - } else { |
|
89 | - $instancePath = $this->getInstancePath(); |
|
90 | - } |
|
91 | - $arguments = array( |
|
92 | - 'documentRoot' => $instancePath, |
|
93 | - 'requestUrl' => 'http://localhost' . $requestUrl, |
|
94 | - ); |
|
95 | - |
|
96 | - $template = new \Text_Template('ntf://Frontend/Request.tpl'); |
|
97 | - $template->setVar( |
|
98 | - array( |
|
99 | - 'arguments' => var_export($arguments, true), |
|
100 | - 'originalRoot' => ORIGINAL_ROOT, |
|
101 | - 'ntfRoot' => __DIR__ . '/../../.Build/vendor/nimut/testing-framework/', |
|
102 | - ) |
|
103 | - ); |
|
104 | - |
|
105 | - $php = \PHPUnit_Util_PHP::factory(); |
|
106 | - $response = $php->runJob($template->render()); |
|
107 | - $result = json_decode($response['stdout'], true); |
|
108 | - |
|
109 | - if ($result === null) { |
|
110 | - $this->fail('Frontend Response is empty.' . LF . 'Error: ' . LF . $response['stderr']); |
|
111 | - } |
|
112 | - |
|
113 | - if ($failOnFailure && $result['status'] === Response::STATUS_Failure) { |
|
114 | - $this->fail('Frontend Response has failure:' . LF . $result['error']); |
|
115 | - } |
|
116 | - |
|
117 | - $response = new Response($result['status'], $result['content'], $result['error']); |
|
118 | - return $response; |
|
119 | - } |
|
74 | + /** |
|
75 | + * @param array $requestArguments |
|
76 | + * @param bool $failOnFailure |
|
77 | + * @return Response |
|
78 | + */ |
|
79 | + protected function fetchFrontendResponse(array $requestArguments, $failOnFailure = true) |
|
80 | + { |
|
81 | + if (!empty($requestArguments['url'])) { |
|
82 | + $requestUrl = '/' . ltrim($requestArguments['url'], '/'); |
|
83 | + } else { |
|
84 | + $requestUrl = '/?' . GeneralUtility::implodeArrayForUrl('', $requestArguments); |
|
85 | + } |
|
86 | + if (property_exists($this, 'instancePath')) { |
|
87 | + $instancePath = $this->instancePath; |
|
88 | + } else { |
|
89 | + $instancePath = $this->getInstancePath(); |
|
90 | + } |
|
91 | + $arguments = array( |
|
92 | + 'documentRoot' => $instancePath, |
|
93 | + 'requestUrl' => 'http://localhost' . $requestUrl, |
|
94 | + ); |
|
95 | + |
|
96 | + $template = new \Text_Template('ntf://Frontend/Request.tpl'); |
|
97 | + $template->setVar( |
|
98 | + array( |
|
99 | + 'arguments' => var_export($arguments, true), |
|
100 | + 'originalRoot' => ORIGINAL_ROOT, |
|
101 | + 'ntfRoot' => __DIR__ . '/../../.Build/vendor/nimut/testing-framework/', |
|
102 | + ) |
|
103 | + ); |
|
104 | + |
|
105 | + $php = \PHPUnit_Util_PHP::factory(); |
|
106 | + $response = $php->runJob($template->render()); |
|
107 | + $result = json_decode($response['stdout'], true); |
|
108 | + |
|
109 | + if ($result === null) { |
|
110 | + $this->fail('Frontend Response is empty.' . LF . 'Error: ' . LF . $response['stderr']); |
|
111 | + } |
|
112 | + |
|
113 | + if ($failOnFailure && $result['status'] === Response::STATUS_Failure) { |
|
114 | + $this->fail('Frontend Response has failure:' . LF . $result['error']); |
|
115 | + } |
|
116 | + |
|
117 | + $response = new Response($result['status'], $result['content'], $result['error']); |
|
118 | + return $response; |
|
119 | + } |
|
120 | 120 | } |
@@ -41,7 +41,7 @@ |
||
41 | 41 | 'version' => '0.0.1', |
42 | 42 | 'constraints' => [ |
43 | 43 | 'depends' => [ |
44 | - 'php' => '5.3.0-0.0.0', |
|
44 | + 'php' => '5.3.0-0.0.0', |
|
45 | 45 | 'typo3' => '6.2.0-8.99.99' |
46 | 46 | ], |
47 | 47 | 'conflicts' => [], |