@@ -250,22 +250,22 @@ |
||
250 | 250 | } |
251 | 251 | |
252 | 252 | /** |
253 | - * Returns the native language name for the selected locale/language, empty string if Translatable is not available |
|
254 | - * |
|
255 | - * @return string |
|
256 | - */ |
|
257 | - public function getSelectedLanguage() |
|
258 | - { |
|
259 | - if (!class_exists('Translatable')) { |
|
260 | - return ''; |
|
261 | - } |
|
262 | - |
|
263 | - $language = explode('_', Translatable::get_current_locale()); |
|
264 | - $languageCode = array_shift($language); |
|
265 | - $nativeName = i18n::get_language_name($languageCode, true); |
|
266 | - |
|
267 | - return $nativeName; |
|
268 | - } |
|
253 | + * Returns the native language name for the selected locale/language, empty string if Translatable is not available |
|
254 | + * |
|
255 | + * @return string |
|
256 | + */ |
|
257 | + public function getSelectedLanguage() |
|
258 | + { |
|
259 | + if (!class_exists('Translatable')) { |
|
260 | + return ''; |
|
261 | + } |
|
262 | + |
|
263 | + $language = explode('_', Translatable::get_current_locale()); |
|
264 | + $languageCode = array_shift($language); |
|
265 | + $nativeName = i18n::get_language_name($languageCode, true); |
|
266 | + |
|
267 | + return $nativeName; |
|
268 | + } |
|
269 | 269 | } |
270 | 270 | |
271 | 271 | class BasePage_Controller extends ContentController { |
@@ -1,80 +1,80 @@ |
||
1 | 1 | <?php |
2 | 2 | class BasePageTest extends SapphireTest |
3 | 3 | { |
4 | - public static $fixture_file = 'BasePageTest.yml'; |
|
4 | + public static $fixture_file = 'BasePageTest.yml'; |
|
5 | 5 | |
6 | - public function setUp() |
|
7 | - { |
|
8 | - parent::setUp(); |
|
6 | + public function setUp() |
|
7 | + { |
|
8 | + parent::setUp(); |
|
9 | 9 | |
10 | - Config::nest(); |
|
11 | - Config::inst()->update('BasePage', 'pdf_export', true); |
|
12 | - Config::inst()->update('BasePage', 'generated_pdf_path', 'assets/_generated_pdfs'); |
|
13 | - } |
|
10 | + Config::nest(); |
|
11 | + Config::inst()->update('BasePage', 'pdf_export', true); |
|
12 | + Config::inst()->update('BasePage', 'generated_pdf_path', 'assets/_generated_pdfs'); |
|
13 | + } |
|
14 | 14 | |
15 | - public function testPdfFilename() |
|
16 | - { |
|
17 | - $page = $this->objFromFixture('BasePage', 'test-page-one'); |
|
18 | - $this->assertContains( |
|
19 | - 'assets/_generated_pdfs/test-page-one-1.pdf', |
|
20 | - $page->getPdfFilename(), |
|
21 | - 'Generated filename for PDF' |
|
22 | - ); |
|
23 | - } |
|
15 | + public function testPdfFilename() |
|
16 | + { |
|
17 | + $page = $this->objFromFixture('BasePage', 'test-page-one'); |
|
18 | + $this->assertContains( |
|
19 | + 'assets/_generated_pdfs/test-page-one-1.pdf', |
|
20 | + $page->getPdfFilename(), |
|
21 | + 'Generated filename for PDF' |
|
22 | + ); |
|
23 | + } |
|
24 | 24 | |
25 | - public function testPdfLink() |
|
26 | - { |
|
27 | - $page = $this->objFromFixture('BasePage', 'test-page-one'); |
|
28 | - $this->assertContains('test-page-one/downloadpdf', $page->PdfLink(), 'Link to download PDF'); |
|
29 | - } |
|
25 | + public function testPdfLink() |
|
26 | + { |
|
27 | + $page = $this->objFromFixture('BasePage', 'test-page-one'); |
|
28 | + $this->assertContains('test-page-one/downloadpdf', $page->PdfLink(), 'Link to download PDF'); |
|
29 | + } |
|
30 | 30 | |
31 | - public function testHomePagePdfLink() |
|
32 | - { |
|
33 | - $page = $this->objFromFixture('BasePage', 'home-page'); |
|
34 | - $this->assertContains('home/downloadpdf', $page->PdfLink(), 'Link to download PDF'); |
|
35 | - } |
|
31 | + public function testHomePagePdfLink() |
|
32 | + { |
|
33 | + $page = $this->objFromFixture('BasePage', 'home-page'); |
|
34 | + $this->assertContains('home/downloadpdf', $page->PdfLink(), 'Link to download PDF'); |
|
35 | + } |
|
36 | 36 | |
37 | - public function testPdfLinkDisabled() |
|
38 | - { |
|
39 | - Config::inst()->update('BasePage', 'pdf_export', false); |
|
40 | - $page = $this->objFromFixture('BasePage', 'test-page-one'); |
|
41 | - $this->assertFalse($page->PdfLink(), 'No PDF link as the functionality is disabled'); |
|
42 | - } |
|
37 | + public function testPdfLinkDisabled() |
|
38 | + { |
|
39 | + Config::inst()->update('BasePage', 'pdf_export', false); |
|
40 | + $page = $this->objFromFixture('BasePage', 'test-page-one'); |
|
41 | + $this->assertFalse($page->PdfLink(), 'No PDF link as the functionality is disabled'); |
|
42 | + } |
|
43 | 43 | |
44 | - /** |
|
45 | - * Test that the native language name can be returned for the current locale |
|
46 | - * |
|
47 | - * @see i18n |
|
48 | - * @param string $locale |
|
49 | - * @param string $expected |
|
50 | - * @dataProvider localeProvider |
|
51 | - */ |
|
52 | - public function testGetSelectedLanguage($locale, $expected) |
|
53 | - { |
|
54 | - if (!class_exists('Translatable')) { |
|
55 | - $this->markTestSkipped('Language tests require Translatable module.'); |
|
56 | - } |
|
44 | + /** |
|
45 | + * Test that the native language name can be returned for the current locale |
|
46 | + * |
|
47 | + * @see i18n |
|
48 | + * @param string $locale |
|
49 | + * @param string $expected |
|
50 | + * @dataProvider localeProvider |
|
51 | + */ |
|
52 | + public function testGetSelectedLanguage($locale, $expected) |
|
53 | + { |
|
54 | + if (!class_exists('Translatable')) { |
|
55 | + $this->markTestSkipped('Language tests require Translatable module.'); |
|
56 | + } |
|
57 | 57 | |
58 | - Translatable::set_current_locale($locale); |
|
59 | - $page = $this->objFromFixture('BasePage', 'test-page-one'); |
|
60 | - $this->assertSame($expected, $page->getSelectedLanguage()); |
|
61 | - } |
|
58 | + Translatable::set_current_locale($locale); |
|
59 | + $page = $this->objFromFixture('BasePage', 'test-page-one'); |
|
60 | + $this->assertSame($expected, $page->getSelectedLanguage()); |
|
61 | + } |
|
62 | 62 | |
63 | - /** |
|
64 | - * @return array[] |
|
65 | - */ |
|
66 | - public function localeProvider() |
|
67 | - { |
|
68 | - return array( |
|
69 | - array('en_NZ', 'English'), |
|
70 | - array('af_ZA', 'Afrikaans'), |
|
71 | - array('es_ES', 'español') |
|
72 | - ); |
|
73 | - } |
|
63 | + /** |
|
64 | + * @return array[] |
|
65 | + */ |
|
66 | + public function localeProvider() |
|
67 | + { |
|
68 | + return array( |
|
69 | + array('en_NZ', 'English'), |
|
70 | + array('af_ZA', 'Afrikaans'), |
|
71 | + array('es_ES', 'español') |
|
72 | + ); |
|
73 | + } |
|
74 | 74 | |
75 | - public function tearDown() |
|
76 | - { |
|
77 | - Config::unnest(); |
|
78 | - parent::tearDown(); |
|
79 | - } |
|
75 | + public function tearDown() |
|
76 | + { |
|
77 | + Config::unnest(); |
|
78 | + parent::tearDown(); |
|
79 | + } |
|
80 | 80 | } |
@@ -44,10 +44,10 @@ |
||
44 | 44 | $query->exclude('SiteTree_ShowInSearch', 0); |
45 | 45 | |
46 | 46 | // Add File_ShowInSearch if the File class is in the query |
47 | - $classes = array_column($classes, 'class'); |
|
48 | - if (in_array('File', $classes)) { |
|
49 | - $query->exclude('File_ShowInSearch', 0); |
|
50 | - } |
|
47 | + $classes = array_column($classes, 'class'); |
|
48 | + if (in_array('File', $classes)) { |
|
49 | + $query->exclude('File_ShowInSearch', 0); |
|
50 | + } |
|
51 | 51 | |
52 | 52 | // Artificially lower the amount of results to prevent too high resource usage. |
53 | 53 | // on subsequent canView check loop. |
@@ -5,41 +5,41 @@ |
||
5 | 5 | */ |
6 | 6 | class CwpSiteSummaryExtension extends Extension |
7 | 7 | { |
8 | - /** |
|
9 | - * Updates the modules used for the version label by: |
|
10 | - * - Removing SS Framework |
|
11 | - * - Adding CWP |
|
12 | - * - Relabelling SS CMS |
|
13 | - * |
|
14 | - * @param array $modules |
|
15 | - */ |
|
16 | - public function updateVersionModules(&$modules) |
|
17 | - { |
|
18 | - unset($modules['silverstripe/framework']); |
|
19 | - $modules = ['cwp/cwp' => 'CWP'] + $modules; |
|
20 | - $modules['silverstripe/cms'] = 'SilverStripe CMS'; |
|
21 | - } |
|
8 | + /** |
|
9 | + * Updates the modules used for the version label by: |
|
10 | + * - Removing SS Framework |
|
11 | + * - Adding CWP |
|
12 | + * - Relabelling SS CMS |
|
13 | + * |
|
14 | + * @param array $modules |
|
15 | + */ |
|
16 | + public function updateVersionModules(&$modules) |
|
17 | + { |
|
18 | + unset($modules['silverstripe/framework']); |
|
19 | + $modules = ['cwp/cwp' => 'CWP'] + $modules; |
|
20 | + $modules['silverstripe/cms'] = 'SilverStripe CMS'; |
|
21 | + } |
|
22 | 22 | |
23 | - /** |
|
24 | - * Updates the dropdown filter used to filter supported packages by renaming the labels (replaces the existing |
|
25 | - * filter options) |
|
26 | - * |
|
27 | - * @param GridFieldDropdownFilter $dropdownFilter |
|
28 | - */ |
|
29 | - public function updateDropdownFilterOptions($dropdownFilter) |
|
30 | - { |
|
31 | - $dropdownFilter->removeFilterOption('supported'); |
|
32 | - $dropdownFilter->removeFilterOption('unsupported'); |
|
23 | + /** |
|
24 | + * Updates the dropdown filter used to filter supported packages by renaming the labels (replaces the existing |
|
25 | + * filter options) |
|
26 | + * |
|
27 | + * @param GridFieldDropdownFilter $dropdownFilter |
|
28 | + */ |
|
29 | + public function updateDropdownFilterOptions($dropdownFilter) |
|
30 | + { |
|
31 | + $dropdownFilter->removeFilterOption('supported'); |
|
32 | + $dropdownFilter->removeFilterOption('unsupported'); |
|
33 | 33 | |
34 | - $dropdownFilter->addFilterOption( |
|
35 | - 'supported', |
|
36 | - _t(__CLASS__ . '.FilterSupported', 'CWP recipe modules'), |
|
37 | - ['Supported' => true] |
|
38 | - ); |
|
39 | - $dropdownFilter->addFilterOption( |
|
40 | - 'unsupported', |
|
41 | - _t(__CLASS__ . '.FilterUnsupported', 'Non CWP modules'), |
|
42 | - ['Supported' => false] |
|
43 | - ); |
|
44 | - } |
|
34 | + $dropdownFilter->addFilterOption( |
|
35 | + 'supported', |
|
36 | + _t(__CLASS__ . '.FilterSupported', 'CWP recipe modules'), |
|
37 | + ['Supported' => true] |
|
38 | + ); |
|
39 | + $dropdownFilter->addFilterOption( |
|
40 | + 'unsupported', |
|
41 | + _t(__CLASS__ . '.FilterUnsupported', 'Non CWP modules'), |
|
42 | + ['Supported' => false] |
|
43 | + ); |
|
44 | + } |
|
45 | 45 | } |
@@ -11,48 +11,48 @@ |
||
11 | 11 | */ |
12 | 12 | class MaintenanceProxyExtension extends Extension |
13 | 13 | { |
14 | - /** |
|
15 | - * Configures required environment settings for Composer's use, applies to |
|
16 | - * {@link \BringYourOwnIdeas\Maintenance\Util\ComposerLoader} and is applied before ComposerLoaderExtension in |
|
17 | - * bringyourownideas/silverstripe-composer-update-checker to ensure the proxy information is set before Composer |
|
18 | - * is created |
|
19 | - */ |
|
20 | - public function onAfterBuild() |
|
21 | - { |
|
22 | - // Provide access for Composer's StreamContextFactory, since it creates its own stream context |
|
23 | - if ($proxy = $this->getCwpProxy()) { |
|
24 | - $_SERVER['CGI_HTTP_PROXY'] = $proxy; |
|
25 | - } |
|
26 | - } |
|
14 | + /** |
|
15 | + * Configures required environment settings for Composer's use, applies to |
|
16 | + * {@link \BringYourOwnIdeas\Maintenance\Util\ComposerLoader} and is applied before ComposerLoaderExtension in |
|
17 | + * bringyourownideas/silverstripe-composer-update-checker to ensure the proxy information is set before Composer |
|
18 | + * is created |
|
19 | + */ |
|
20 | + public function onAfterBuild() |
|
21 | + { |
|
22 | + // Provide access for Composer's StreamContextFactory, since it creates its own stream context |
|
23 | + if ($proxy = $this->getCwpProxy()) { |
|
24 | + $_SERVER['CGI_HTTP_PROXY'] = $proxy; |
|
25 | + } |
|
26 | + } |
|
27 | 27 | |
28 | - /** |
|
29 | - * Provide proxy options for {@link \BringYourOwnIdeas\Maintenance\Util\ApiLoader} instances to use in |
|
30 | - * their Guzzle clients |
|
31 | - * |
|
32 | - * @param array $options |
|
33 | - */ |
|
34 | - public function updateClientOptions(&$options) |
|
35 | - { |
|
36 | - if ($proxy = $this->getCwpProxy()) { |
|
37 | - $options['proxy'] = $proxy; |
|
38 | - } |
|
39 | - } |
|
28 | + /** |
|
29 | + * Provide proxy options for {@link \BringYourOwnIdeas\Maintenance\Util\ApiLoader} instances to use in |
|
30 | + * their Guzzle clients |
|
31 | + * |
|
32 | + * @param array $options |
|
33 | + */ |
|
34 | + public function updateClientOptions(&$options) |
|
35 | + { |
|
36 | + if ($proxy = $this->getCwpProxy()) { |
|
37 | + $options['proxy'] = $proxy; |
|
38 | + } |
|
39 | + } |
|
40 | 40 | |
41 | - /** |
|
42 | - * Returns a formatted CWP proxy string, e.g. `tcp://proxy.cwp.govt.nz:1234` |
|
43 | - * |
|
44 | - * @return string |
|
45 | - */ |
|
46 | - protected function getCwpProxy() |
|
47 | - { |
|
48 | - if (!defined('SS_OUTBOUND_PROXY') || !defined('SS_OUTBOUND_PROXY_PORT')) { |
|
49 | - return ''; |
|
50 | - } |
|
41 | + /** |
|
42 | + * Returns a formatted CWP proxy string, e.g. `tcp://proxy.cwp.govt.nz:1234` |
|
43 | + * |
|
44 | + * @return string |
|
45 | + */ |
|
46 | + protected function getCwpProxy() |
|
47 | + { |
|
48 | + if (!defined('SS_OUTBOUND_PROXY') || !defined('SS_OUTBOUND_PROXY_PORT')) { |
|
49 | + return ''; |
|
50 | + } |
|
51 | 51 | |
52 | - return sprintf( |
|
53 | - 'tcp://%s:%d', |
|
54 | - SS_OUTBOUND_PROXY, |
|
55 | - SS_OUTBOUND_PROXY_PORT |
|
56 | - ); |
|
57 | - } |
|
52 | + return sprintf( |
|
53 | + 'tcp://%s:%d', |
|
54 | + SS_OUTBOUND_PROXY, |
|
55 | + SS_OUTBOUND_PROXY_PORT |
|
56 | + ); |
|
57 | + } |
|
58 | 58 | } |