tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

FIX Deprecated yml syntax

Browse Source
This commit is contained in:
Daniel Hensby 2017-07-21 11:17:18 +01:00
parent 43620129c0
commit 5bf9ccc235
No known key found for this signature in database
GPG Key ID: B00D1E9767F0B06E
9 changed files with 48 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_config/cache.yml
View File

@ -8,7 +8,7 @@ SilverStripe\Core\Injector\Injector:
args: args:
directory: '`TEMP_FOLDER`' directory: '`TEMP_FOLDER`'
version: null version: null
logger: %$Psr\Log\LoggerInterface logger: '%$Psr\Log\LoggerInterface'
Psr\SimpleCache\CacheInterface.cacheblock: Psr\SimpleCache\CacheInterface.cacheblock:
factory: SilverStripe\Core\Cache\CacheFactory factory: SilverStripe\Core\Cache\CacheFactory
constructor: constructor:

12
_config/database.yml
View File

@ -5,15 +5,15 @@ SilverStripe\Core\Injector\Injector:
MySQLPDODatabase: MySQLPDODatabase:
class: 'SilverStripe\ORM\Connect\MySQLDatabase' class: 'SilverStripe\ORM\Connect\MySQLDatabase'
properties: properties:
connector: %$PDOConnector connector: '%$PDOConnector'
schemaManager: %$MySQLSchemaManager schemaManager: '%$MySQLSchemaManager'
queryBuilder: %$MySQLQueryBuilder queryBuilder: '%$MySQLQueryBuilder'
MySQLDatabase: MySQLDatabase:
class: 'SilverStripe\ORM\Connect\MySQLDatabase' class: 'SilverStripe\ORM\Connect\MySQLDatabase'
properties: properties:
connector: %$MySQLiConnector connector: '%$MySQLiConnector'
schemaManager: %$MySQLSchemaManager schemaManager: '%$MySQLSchemaManager'
queryBuilder: %$MySQLQueryBuilder queryBuilder: '%$MySQLQueryBuilder'
MySQLiConnector: MySQLiConnector:
class: 'SilverStripe\ORM\Connect\MySQLiConnector' class: 'SilverStripe\ORM\Connect\MySQLiConnector'
type: prototype type: prototype

14
_config/i18n.yml
View File

@ -24,14 +24,14 @@ SilverStripe\Core\Injector\Injector:
Symfony\Component\Translation\Loader\LoaderInterface: Symfony\Component\Translation\Loader\LoaderInterface:
class: SilverStripe\i18n\Messages\Symfony\ModuleYamlLoader class: SilverStripe\i18n\Messages\Symfony\ModuleYamlLoader
properties: properties:
Reader: %$SilverStripe\i18n\Messages\Reader Reader: '%$SilverStripe\i18n\Messages\Reader'
# Ensure our cache respects ModuleYamlLoader's self-invalidation # Ensure our cache respects ModuleYamlLoader's self-invalidation
# @see DirectoryListResource::isFresh() # @see DirectoryListResource::isFresh()
# Note: This could be replaced with a more aggressive cache if necessary on a live environment # Note: This could be replaced with a more aggressive cache if necessary on a live environment
Symfony\Component\Config\ConfigCacheFactoryInterface: Symfony\Component\Config\ConfigCacheFactoryInterface:
class: Symfony\Component\Config\ResourceCheckerConfigCacheFactory class: Symfony\Component\Config\ResourceCheckerConfigCacheFactory
constructor: constructor:
0: [ %$Symfony\Component\Config\Resource\SelfCheckingResourceChecker ] 0: [ '%$Symfony\Component\Config\Resource\SelfCheckingResourceChecker' ]
# Create default translator with standard cache path and our custom loader # Create default translator with standard cache path and our custom loader
Symfony\Component\Translation\TranslatorInterface: Symfony\Component\Translation\TranslatorInterface:
class: Symfony\Component\Translation\Translator class: Symfony\Component\Translation\Translator
@ -40,23 +40,23 @@ SilverStripe\Core\Injector\Injector:
1: null 1: null
2: '`TEMP_FOLDER`' 2: '`TEMP_FOLDER`'
properties: properties:
ConfigCacheFactory: %$Symfony\Component\Config\ConfigCacheFactoryInterface ConfigCacheFactory: '%$Symfony\Component\Config\ConfigCacheFactoryInterface'
calls: calls:
FallbackLocales: [ setFallbackLocales, [['en']]] FallbackLocales: [ setFallbackLocales, [['en']]]
Loader: [ addLoader, ['ss', %$Symfony\Component\Translation\Loader\LoaderInterface ]] Loader: [ addLoader, ['ss', '%$Symfony\Component\Translation\Loader\LoaderInterface' ]]
# Set this translator as our message provider for silverstripe's i18n # Set this translator as our message provider for silverstripe's i18n
SilverStripe\i18n\Messages\MessageProvider: SilverStripe\i18n\Messages\MessageProvider:
class: SilverStripe\i18n\Messages\Symfony\SymfonyMessageProvider class: SilverStripe\i18n\Messages\Symfony\SymfonyMessageProvider
properties: properties:
Translator: %$Symfony\Component\Translation\TranslatorInterface Translator: '%$Symfony\Component\Translation\TranslatorInterface'
--- ---
Name: textcollector Name: textcollector
--- ---
SilverStripe\Core\Injector\Injector: SilverStripe\Core\Injector\Injector:
SilverStripe\i18n\TextCollection\i18nTextCollector: SilverStripe\i18n\TextCollection\i18nTextCollector:
properties: properties:
Reader: %$SilverStripe\i18n\Messages\Reader Reader: '%$SilverStripe\i18n\Messages\Reader'
Writer: %$SilverStripe\i18n\Messages\Writer Writer: '%$SilverStripe\i18n\Messages\Writer'
--- ---
Name: i18ndata Name: i18ndata
--- ---

10
_config/logging.yml
View File

@ -10,14 +10,14 @@ SilverStripe\Core\Injector\Injector:
SilverStripe\Logging\ErrorHandler: SilverStripe\Logging\ErrorHandler:
class: SilverStripe\Logging\MonologErrorHandler class: SilverStripe\Logging\MonologErrorHandler
properties: properties:
Logger: %$Psr\Log\LoggerInterface Logger: '%$Psr\Log\LoggerInterface'
Psr\Log\LoggerInterface: Psr\Log\LoggerInterface:
type: singleton type: singleton
class: Monolog\Logger class: Monolog\Logger
constructor: constructor:
- "error-log" - "error-log"
calls: calls:
pushDisplayErrorHandler: [ pushHandler, [ %$Monolog\Handler\HandlerInterface ] ] pushDisplayErrorHandler: [ pushHandler, [ '%$Monolog\Handler\HandlerInterface' ] ]
--- ---
Name: loggingformatters Name: loggingformatters
--- ---
@ -43,7 +43,7 @@ SilverStripe\Core\Injector\Injector:
constructor: constructor:
- "notice" - "notice"
properties: properties:
DefaultFormatter: %$Monolog\Formatter\FormatterInterface.detailed DefaultFormatter: '%$Monolog\Formatter\FormatterInterface.detailed'
--- ---
Name: live-logging Name: live-logging
Except: Except:
@ -57,5 +57,5 @@ SilverStripe\Core\Injector\Injector:
constructor: constructor:
- "error" - "error"
properties: properties:
DefaultFormatter: %$Monolog\Formatter\FormatterInterface.friendly DefaultFormatter: '%$Monolog\Formatter\FormatterInterface.friendly'
CLIFormatter: %$Monolog\Formatter\FormatterInterface.detailed CLIFormatter: '%$Monolog\Formatter\FormatterInterface.detailed'

2
_config/mimetypes.yml
View File

@ -756,7 +756,6 @@ SilverStripe\Control\HTTP:
stl: application/vnd.ms-pki.stl stl: application/vnd.ms-pki.stl
str: application/vnd.pg.format str: application/vnd.pg.format
stw: application/vnd.sun.xml.writer.template stw: application/vnd.sun.xml.writer.template
sub: image/vnd.dvb.subtitle
sub: text/vnd.dvb.subtitle sub: text/vnd.dvb.subtitle
sus: application/vnd.sus-calendar sus: application/vnd.sus-calendar
susp: application/vnd.sus-calendar susp: application/vnd.sus-calendar
@ -900,7 +899,6 @@ SilverStripe\Control\HTTP:
wmv: video/x-ms-wmv wmv: video/x-ms-wmv
wmx: video/x-ms-wmx wmx: video/x-ms-wmx
wmz: application/x-ms-wmz wmz: application/x-ms-wmz
wmz: application/x-msmetafile
woff: application/x-font-woff woff: application/x-font-woff
wpd: application/vnd.wordperfect wpd: application/vnd.wordperfect
wpl: application/vnd.ms-wpl wpl: application/vnd.ms-wpl

22
_config/model.yml
View File

@ -62,7 +62,7 @@ SilverStripe\Core\Injector\Injector:
Name: coresearchfilters Name: coresearchfilters
--- ---
SilverStripe\Core\Injector\Injector: SilverStripe\Core\Injector\Injector:
DataListFilter.default: %$DataListFilter.ExactMatch DataListFilter.default: '%$DataListFilter.ExactMatch'
DataListFilter.EndsWith: DataListFilter.EndsWith:
class: SilverStripe\ORM\Filters\EndsWithFilter class: SilverStripe\ORM\Filters\EndsWithFilter
DataListFilter.ExactMatch: DataListFilter.ExactMatch:
@ -87,13 +87,13 @@ SilverStripe\Core\Injector\Injector:
Name: coresearchaliases Name: coresearchaliases
--- ---
SilverStripe\Core\Injector\Injector: SilverStripe\Core\Injector\Injector:
EndsWithFilter: %$DataListFilter.EndsWith EndsWithFilter: '%$DataListFilter.EndsWith'
ExactMatchFilter: %$DataListFilter.ExactMatch ExactMatchFilter: '%$DataListFilter.ExactMatch'
FulltextFilter: %$DataListFilter.Fulltext FulltextFilter: '%$DataListFilter.Fulltext'
GreaterThanFilter: $&DataListFilter.GreaterThan GreaterThanFilter: '%$$DataListFilter.GreaterThan'
GreaterThanOrEqualFilter: %$DataListFilter.GreaterThanOrEqual GreaterThanOrEqualFilter: '%$DataListFilter.GreaterThanOrEqual'
LessThanFilter: %$DataListFilter.LessThan LessThanFilter: '%$DataListFilter.LessThan'
LessThanOrEqualFilter: %$DataListFilter.LessThanOrEqual LessThanOrEqualFilter: '%$DataListFilter.LessThanOrEqual'
PartialMatchFilter: %$DataListFilter.PartialMatch PartialMatchFilter: '%$DataListFilter.PartialMatch'
StartsWithFilter: %$DataListFilter.StartsWith StartsWithFilter: '%$DataListFilter.StartsWith'
WithinRangeFilter: %$DataListFilter.WithinRange WithinRangeFilter: '%$DataListFilter.WithinRange'

10
_config/requestprocessors.yml
View File

@ -5,11 +5,11 @@ SilverStripe\Core\Injector\Injector:
SilverStripe\Control\Director: SilverStripe\Control\Director:
properties: properties:
Middlewares: Middlewares:
TrustedProxyMiddleware: %$SilverStripe\Control\Middleware\TrustedProxyMiddleware TrustedProxyMiddleware: '%$SilverStripe\Control\Middleware\TrustedProxyMiddleware'
AllowedHostsMiddleware: %$SilverStripe\Control\Middleware\AllowedHostsMiddleware AllowedHostsMiddleware: '%$SilverStripe\Control\Middleware\AllowedHostsMiddleware'
SessionMiddleware: %$SilverStripe\Control\Middleware\SessionMiddleware SessionMiddleware: '%$SilverStripe\Control\Middleware\SessionMiddleware'
RequestProcessorMiddleware: %$SilverStripe\Control\RequestProcessor RequestProcessorMiddleware: '%$SilverStripe\Control\RequestProcessor'
FlushMiddleware: %$SilverStripe\Control\Middleware\FlushMiddleware FlushMiddleware: '%$SilverStripe\Control\Middleware\FlushMiddleware'
SilverStripe\Control\AllowedHostsMiddleware: SilverStripe\Control\AllowedHostsMiddleware:
properties: properties:
AllowedHosts: "`SS_ALLOWED_HOSTS`" AllowedHosts: "`SS_ALLOWED_HOSTS`"

16
_config/security.yml
View File

@ -9,13 +9,13 @@ SilverStripe\Core\Injector\Injector:
properties: properties:
TokenCookieName: alc_enc TokenCookieName: alc_enc
DeviceCookieName: alc_device DeviceCookieName: alc_device
CascadeInTo: %$SilverStripe\Security\MemberAuthenticator\SessionAuthenticationHandler CascadeInTo: '%$SilverStripe\Security\MemberAuthenticator\SessionAuthenticationHandler'
SilverStripe\Security\AuthenticationHandler: SilverStripe\Security\AuthenticationHandler:
class: SilverStripe\Security\RequestAuthenticationHandler class: SilverStripe\Security\RequestAuthenticationHandler
properties: properties:
Handlers: Handlers:
session: %$SilverStripe\Security\MemberAuthenticator\SessionAuthenticationHandler session: '%$SilverStripe\Security\MemberAuthenticator\SessionAuthenticationHandler'
alc: %$SilverStripe\Security\MemberAuthenticator\CookieAuthenticationHandler alc: '%$SilverStripe\Security\MemberAuthenticator\CookieAuthenticationHandler'
--- ---
Name: coresecurity Name: coresecurity
After: After:
@ -25,16 +25,16 @@ SilverStripe\Core\Injector\Injector:
SilverStripe\Control\Director: SilverStripe\Control\Director:
properties: properties:
Middlewares: Middlewares:
AuthenticationMiddleware: %$SilverStripe\Security\AuthenticationMiddleware AuthenticationMiddleware: '%$SilverStripe\Security\AuthenticationMiddleware'
SilverStripe\Security\AuthenticationMiddleware: SilverStripe\Security\AuthenticationMiddleware:
properties: properties:
AuthenticationHandler: %$SilverStripe\Security\AuthenticationHandler AuthenticationHandler: '%$SilverStripe\Security\AuthenticationHandler'
SilverStripe\Security\Security: SilverStripe\Security\Security:
properties: properties:
Authenticators: Authenticators:
default: %$SilverStripe\Security\MemberAuthenticator\MemberAuthenticator default: '%$SilverStripe\Security\MemberAuthenticator\MemberAuthenticator'
SilverStripe\Security\CMSSecurity: SilverStripe\Security\CMSSecurity:
properties: properties:
Authenticators: Authenticators:
cms: %$SilverStripe\Security\MemberAuthenticator\CMSMemberAuthenticator cms: '%$SilverStripe\Security\MemberAuthenticator\CMSMemberAuthenticator'
SilverStripe\Security\IdentityStore: %$SilverStripe\Security\AuthenticationHandler SilverStripe\Security\IdentityStore: '%$SilverStripe\Security\AuthenticationHandler'

10
_config/tests.yml
View File

@ -5,10 +5,10 @@ SilverStripe\Core\Injector\Injector:
SilverStripe\Dev\State\SapphireTestState: SilverStripe\Dev\State\SapphireTestState:
properties: properties:
States: States:
globals: %$SilverStripe\Dev\State\GlobalsTestState globals: '%$SilverStripe\Dev\State\GlobalsTestState'
extensions: %$SilverStripe\Dev\State\ExtensionTestState extensions: '%$SilverStripe\Dev\State\ExtensionTestState'
flushable: %$SilverStripe\Dev\State\FlushableTestState flushable: '%$SilverStripe\Dev\State\FlushableTestState'
requirements: %$SilverStripe\View\Dev\RequirementsTestState requirements: '%$SilverStripe\View\Dev\RequirementsTestState'
--- ---
Name: kerneltest Name: kerneltest
Before: '*' Before: '*'
@ -17,4 +17,4 @@ SilverStripe\Core\Injector\Injector:
SilverStripe\Dev\State\SapphireTestState: SilverStripe\Dev\State\SapphireTestState:
properties: properties:
States: States:
kernel: %$SilverStripe\Dev\State\KernelTestState kernel: '%$SilverStripe\Dev\State\KernelTestState'