Maxime Rainville
1e01deea39
NEW Make resources dir configurable ( #8519 )
...
* NEW Make resources dir configurable.
* Removing reference to old `resources` and updating doc #8519
* Rrtarget to 4.4 release.
* DOC Reference SS_RESOURCES_DIR in Environment doc.
* API Add a Resources method to SilverStripe\Core\Manifest\Module to read the resources-dir from composer.json
* Clean up reference to SS_RESOURCES_DIR env var
* Set default resources-dir
* Update test to use RESOURCES_DIR const in expected resource url method
* Correcting typos
Co-Authored-By: maxime-rainville <maxime@rainville.me>
* MINOR Correctubg minor typos
* DOCS Document the intricacies of exposing static assets.
2019-01-09 15:35:45 +13:00
Robbie Averill
068c240d38
Update src/Core/CustomMethods.php
...
Co-Authored-By: jchenevey <jchenevey@users.noreply.github.com>
2019-01-08 15:27:38 -05:00
Joe Chenevey
3730d84d18
Update CustomMethods.php
...
Switch to an early `continue` rather than wrapping contents of `foreach` in an `if` and indenting.
2019-01-08 15:24:21 -05:00
Joe Chenevey
afceccb9a6
CustomMethods->removeMethodsFrom Warnings
...
Check to ensure `self::$extra_methods[$class][$method]` exists before trying to retrieve its value. Silences warnings generated by updating a controller's failover.
2019-01-08 15:14:23 -05:00
Sam Minnee
0c17ffc944
FIX: Manifest should ignore vendor folders within packages contained in vendor
...
Without this change vendor/silverstripe/framework/vendor/silverstripe/config
will be pick up by the manifest, which is inappropriate.
Although this doesn’t happen often, it can occur if you have run
“composer install” within vendor/silverstripe/framework, which can be
done either accidentally or (in my case) as part of running the
framework tests isolated from the rest of your project (which is closer
to the execution model on Travis)
Note that the presence of the ‘nestedvendor.txt’ file tests that this
works without any explicit changes to the PHP of the tests, since it’s
merely confirming that such a file is *not* picked up.
2018-11-30 13:52:25 +13:00
Robbie Averill
1f1c344272
Merge branch '4.3' into 4
...
# Conflicts:
# tests/php/Forms/ConfirmedPasswordFieldTest.php
2018-11-26 12:15:17 +01:00
Robbie Averill
41dc9229bf
FIX Reverting ExtensionTestState and Extensible extra methods modifications to prevent PHP 5.6 segfault ( #8581 )
...
* API Revert addition of Extensible::flush_extra_methods_cache() and change to ExtensionTestState
This reverts the changes from #8465 and #8505 that relate to ExtensionTestState and the
tracking of extra methods between unit tests. The existing test from #8465 testing
overloaded Extensions after extra_methods are populated has been updated to show that you
must re-add the extension to flush the extra_methods cache if you need this behaviour.
* Revert change to InjectorTest::testExtendedExtensions
* Revert "Add failing test to show that overloaded extensions are broken in Extensible"
This reverts commit 55e79ffdfd
2018-11-26 12:00:02 +13:00
Robbie Averill
3b1e91eb59
Merge branch '4.2' into 4.3
2018-11-15 13:41:23 +02:00
Robbie Averill
ef0f9dff8a
Merge branch '4.1' into 4.2
2018-11-15 13:41:00 +02:00
Robbie Averill
c6e3a398c7
Merge branch '4.0' into 4.1
2018-11-15 13:40:08 +02:00
Loz Calver
b5bae137bd
FIX: Redirect loop with multiple confirmation tokens present ( fixes #8607 )
2018-11-15 10:59:42 +00:00
Robbie Averill
24d6527845
Merge branch '4.3' into 4
2018-11-09 11:39:27 +02:00
Robbie Averill
10f502f0c7
Merge branch '4.2' into 4.3
2018-11-09 11:39:05 +02:00
Robbie Averill
5b7723df7f
Merge branch '4.1' into 4.2
...
# Conflicts:
# lang/fi.yml
# lang/nl.yml
2018-11-09 11:38:04 +02:00
Robbie Averill
df4d2bd838
Merge branch '4.0' into 4.1
...
# Conflicts:
# lang/da.yml
# lang/eo.yml
# lang/fi.yml
# lang/it.yml
# lang/nl.yml
# lang/sv.yml
2018-11-09 11:36:34 +02:00
Werner M. Krauß
bc0f17fb09
Cleanup Convert
...
* remove unneeded parenthesis and double quotes
* simplify flow / remove unneeded else
2018-11-07 17:45:01 +01:00
Werner M. Krauß
3f321f935a
Convert::memstring2bytes should return integer value
...
bytes are by nature an integer
fixes #8572
2018-11-07 17:01:36 +01:00
Aaron Carlino
76936d863d
Merge branch '4.3' into 4
2018-11-07 23:20:44 +13:00
Loz Calver
11fe5b3adf
Implement ConfirmationTokenChain to handle multiple tokens at once
2018-11-07 11:33:24 +13:00
Loz Calver
8d7c2dafab
[SS-2018-019] Add confirmation token to dev/build
2018-11-07 11:33:24 +13:00
Loz Calver
02ad0f44aa
Implement ConfirmationTokenChain to handle multiple tokens at once
2018-11-07 11:32:55 +13:00
Loz Calver
af000bea9b
[SS-2018-019] Add confirmation token to dev/build
2018-11-07 11:32:55 +13:00
Loz Calver
5563537cc8
Implement ConfirmationTokenChain to handle multiple tokens at once
2018-11-07 11:31:33 +13:00
Loz Calver
0610f76da0
[SS-2018-019] Add confirmation token to dev/build
2018-11-07 11:31:33 +13:00
Loz Calver
0877442c64
Implement ConfirmationTokenChain to handle multiple tokens at once
2018-11-07 11:24:51 +13:00
Loz Calver
3dbb10625c
[SS-2018-019] Add confirmation token to dev/build
2018-11-07 11:24:51 +13:00
Robbie Averill
64c2938c96
Merge branch '4.3' into 4
2018-11-06 11:05:22 +01:00
Robbie Averill
3c58ae009e
Merge branch '4.2' into 4.3
2018-11-06 11:05:08 +01:00
Robbie Averill
22c7fa2bc9
Merge branch '4.1' into 4.2
2018-11-06 11:04:43 +01:00
Robbie Averill
6d2665d687
Merge branch '4.0' into 4.1
2018-11-06 11:04:28 +01:00
Werner M. Krauß
adafd73943
Convert::memstring2bytes should preserve -1
...
fixes #8570
2018-11-06 10:22:13 +01:00
Aaron Carlino
0ba275cb40
Merge branch '4.2' into 4.3
2018-11-06 15:09:01 +13:00
Aaron Carlino
e60cea8561
Merge branch '4.1' into 4.2
2018-11-06 15:08:42 +13:00
Robbie Averill
98c038688d
Add missing deprecation notices to Convert json methods
2018-10-29 22:15:22 +00:00
Robbie Averill
b02a6fa02d
FIX Replace usage of Convert JSON methods with json_encode
2018-10-28 21:15:29 +00:00
Robbie Averill
9724d1dd73
API Convert JSON methods are now deprecated, use json_encode or decode instead
2018-10-28 21:13:47 +00:00
Sam Minnée
e72fc9e3d0
FIX DataObject singleton creation ( #8516 )
...
Ensure DataObject instances are aware they are singletons so functions like populateDefaults() can be skipped. (fixes #4878 )
Correctly applies https://github.com/silverstripe/silverstripe-framework/pull/7850 to the 4.x line
This has already been fixed in 3.x
2018-10-25 11:42:45 +13:00
Robbie Averill
311fd62d95
FIX getExtensionInstance can return null, add a case to handle that
2018-10-19 18:12:13 +02:00
Robbie Averill
516267ed46
Merge pull request #8470 from kinglozzer/suf-fixing-the-suffix
...
FIX: Re-instate missing SS_DATABASE_SUFFIX functionality (fixes #7966 )
2018-10-12 23:11:54 +02:00
Loz Calver
ee21c42011
FIX: Re-instate missing SS_DATABASE_SUFFIX functionality ( fixes #7966 )
2018-10-11 10:50:56 +01:00
Robbie Averill
56d5621934
FIX Flush extra_methods statics between test runs
2018-10-09 13:22:54 +02:00
Guy Marriott
5970fc2417
FIX Moving test to correct director
2018-10-03 10:47:17 +13:00
Robbie Averill
f842ee2eec
Update deprecation PHPDocs to be PSR-5 compliant
...
See: https://github.com/php-fig/fig-standards/blob/master/proposed/phpdoc-tags.md#55-deprecated
2018-09-28 10:49:14 +02:00
Ingo Schommer
25759ffc5f
NEW Show file path on PHP parser exceptions
2018-09-28 08:58:47 +12:00
Daniel Hensby
bd2abc7a12
Merge branch '4.1' into 4.2
2018-07-13 16:44:23 +01:00
Daniel Hensby
ec9281ee02
Merge branch '4.0' into 4.1
2018-07-13 16:42:00 +01:00
Daniel Hensby
4acec33562
FIX Fixed bug in config merging priorities so that config values set by extensions are now least important instead of most important
2018-07-12 00:55:39 +01:00
Damian Mooyman
6c985c4e5f
Merge remote-tracking branch 'origin/4.1' into 4
2018-06-13 11:25:20 +12:00
Daniel Hensby
ce58890baf
Merge branch '4.0' into 4.1
2018-06-11 09:27:42 +01:00
Damian Mooyman
c070e989c4
BUG Safely handle empty injector factory responses
...
Fixes issue with ImageBackendFactory returning null and breaking injector
2018-06-06 16:45:16 +12:00
Robbie Averill
ea16e28aa7
Merge branch '4.1' into 4
2018-05-28 18:33:56 +12:00
Robbie Averill
3a537bc745
Merge branch 'heads/4.0.4' into 4.0
2018-05-28 17:50:07 +12:00
Robbie Averill
722202fef4
Merge remote-tracking branch 'origin/4.0.4' into 4.1.1
...
# Conflicts:
# src/Control/Director.php
2018-05-24 15:41:11 +12:00
Damian Mooyman
d935140a95
[ss-2018-005] Prevent unauthenticated isDev / isTest being allowed
2018-05-14 17:03:39 +12:00
Damian Mooyman
7351caf487
API Allow non-DataExtension Extensions to decorate dataobject
2018-03-23 12:22:27 +13:00
Damian Mooyman
26402f3bb5
ENHANCEMENT Enable request handlers to be extended
2018-03-21 15:50:31 +13:00
Christopher Joe
1cdbab45c9
Added comment about array_merge() not working
2018-02-27 09:52:42 +13:00
Aaron Carlino
0863bac29a
Update getVariables to return a copy of globals rather than including the reference in an array merge
2018-02-27 09:52:36 +13:00
Christopher Joe
f650c92436
Added comment about array_merge() not working
2018-02-26 12:24:02 +13:00
Aaron Carlino
d91648dd6e
Update getVariables to return a copy of globals rather than including the reference in an array merge
2018-02-23 16:25:41 +13:00
Damian Mooyman
e809c0fd62
Merge remote-tracking branch 'origin/4.0' into 4.1
2018-02-15 09:27:51 +13:00
Damian Mooyman
0b7cf80331
BUG Fix incorrect convert slashes argument
2018-02-13 16:33:35 +13:00
zanderwar
9ce21338a3
ENHANCEMENT composer.json missing notice
2018-02-13 09:03:01 +10:00
Daniel Hensby
62057befdb
Merge branch '4.0' into 4
2018-02-06 10:08:17 +00:00
Daniel Hensby
28ca11dd7e
FIX Regex range identifier correctly escaped
2018-02-05 15:17:20 +00:00
Damian Mooyman
e359948eb3
Merge remote-tracking branch 'origin/4.0' into 4
...
# Conflicts:
# src/Core/CoreKernel.php
2018-02-05 17:52:38 +13:00
Damian Mooyman
cb30e09130
Update reference from $databaseConfig to .env
2018-02-01 12:58:55 +13:00
Raissa North
cd6faac7a9
FIX Fix typo in error message
2018-01-30 15:48:42 +13:00
Damian Mooyman
a3c52f901a
Merge remote-tracking branch 'origin/4.0' into 4
...
# Conflicts:
# src/Core/TempFolder.php
# src/ORM/DataObject.php
# src/View/ThemeResourceLoader.php
# src/includes/constants.php
# tests/php/Control/SimpleResourceURLGeneratorTest.php
# tests/php/Forms/HTMLEditor/HTMLEditorFieldTest.php
# tests/php/View/RequirementsTest.php
2018-01-22 14:57:05 +13:00
Daniel Hensby
db610aaf3b
Fixing string concat CS issues
2018-01-16 18:39:30 +00:00
Daniel Hensby
e4b936c7c7
Merge branch '4.0' into 4
2018-01-12 14:40:33 +00:00
Damian Mooyman
8d077203d4
API Implement support for public/ webroot folder ( #7741 )
...
* API Implement support for public/ webroot folder
* Bugfixes and refactor based on feedback
2018-01-12 16:25:02 +13:00
Daniel Hensby
7d66342496
FIX Allow extension instances to be overridden by injector
2018-01-12 00:38:15 +00:00
Damian Mooyman
529e341dbc
Merge pull request #7699 from open-sausages/pulls/4/html-in-security-msg
...
ENHANCEMENT Allow html in security failure message
2017-12-14 14:30:09 +13:00
Damian Mooyman
1c8576cee7
Linting cleanup
2017-12-14 14:18:41 +13:00
Damian Mooyman
8b1b9f022b
Fix linting issues
2017-12-14 13:50:52 +13:00
Damian Mooyman
ee27329728
Minor linting / style updates
2017-12-11 16:46:59 +13:00
Aaron Carlino
86458941be
Refactor to MemberCacheFlusher
2017-12-11 16:46:59 +13:00
Aaron Carlino
eecb9f64d3
Add new InheritedPermissionFlusher extension, CacheFlusher service
2017-12-11 16:46:59 +13:00
Daniel Hensby
eb55c27124
Merge branch '4.0' into 4
2017-12-05 12:14:22 +00:00
Damian Mooyman
9666222637
BUG Fix _configure_database.php being ignored
...
Fixes #7590
2017-11-29 12:01:24 +13:00
Daniel Hensby
6d5cbe0a0e
Merge branch '4.0' into 4
2017-11-25 17:19:31 +00:00
Andrew Aitken-Fincham
3620e57b5b
check for apc.enable_cli when running from CLI
2017-11-22 08:50:20 +00:00
Damian Mooyman
420041f2b6
Merge remote-tracking branch 'origin/4.0' into 4
2017-11-03 17:04:44 +13:00
Reece Alexander
9c836c0d3d
Added missing @deprecated tags
...
This PR just adds a couple of @deprecated tags where they were missing, where IDE's like PHPStorm immediately alert the user that it's deprecated.
2017-11-02 20:28:01 +13:00
Damian Mooyman
0b3ed7ff15
Merge 4.0 -> 4
2017-11-02 16:52:05 +13:00
Damian Mooyman
df50c8da03
BUG Use parse_str in place of guzzle library
...
Fixes #7540
2017-11-02 11:52:39 +13:00
Damian Mooyman
29af6dbafd
Merge remote-tracking branch 'origin/4.0' into 4
2017-10-25 16:59:19 +13:00
Damian Mooyman
ff992de231
Merge pull request #7493 from kinglozzer/require-me-some-isolation
...
FIX: Use isolated scope when requiring files for module activation
2017-10-24 14:19:37 +13:00
Sam Minnee
4bec62ba51
Merge branch '4.0' into 4
2017-10-20 18:45:16 +13:00
Damian Mooyman
b9cb1e69e6
BUG Replace phpdotenv with thread-safe replacement
2017-10-20 18:43:11 +13:00
Loz Calver
bb9501797f
FIX: Use isolated scope when requiring files for module activation
2017-10-20 09:11:00 +13:00
Chris Joe
cafa3fc29a
BUG switch to trigger_error() when a resource is not found ( #7468 )
...
* BUG switch to `trigger_error()` when a resource is not found rather than throw an exception
* Add unit test for module url failing
2017-10-16 16:11:42 +13:00
Loz Calver
7afab3043d
Merge pull request #7461 from open-sausages/pulls/4.0/fix-icon-urls
...
Fix references to resource paths / urls
2017-10-10 09:08:08 +01:00
Damian Mooyman
6a55dcfc16
Fix references to resource paths / urls
2017-10-10 16:51:47 +13:00
Damian Mooyman
11b2c74533
ENHANCEMENT Improve upgrade experience for beta3 -> beta4 upgrade
2017-10-10 15:27:41 +13:00
Ingo Schommer
4a94dfe55b
Remove "url" query param reliance, use index.php
...
See https://github.com/silverstripe/silverstripe-framework/issues/7430
2017-10-09 17:21:43 +13:00
Christopher Joe
3560a0418d
rename TEMP_FOLDER to TEMP_PATH
2017-10-09 12:41:34 +13:00
Damian Mooyman
313f8c7ac3
Merge pull request #7439 from creative-commoners/pulls/4.0/trim-injector-names
...
FIX Trim whitespace off names in Injector
2017-10-09 12:31:11 +13:00
Robbie Averill
3bdc8c7e65
FIX Trim whitespace off names in Injector
2017-10-06 15:52:44 +13:00
