mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
Merge branch '4.13' into 4
This commit is contained in:
commit
9a79b40eac
@ -65,6 +65,7 @@ use SilverStripe\View\ViewableData;
|
|||||||
* For example, the "URLSegment" field in a standard CMS form would be
|
* For example, the "URLSegment" field in a standard CMS form would be
|
||||||
* accessible through "admin/EditForm/field/URLSegment/FieldHolder".
|
* accessible through "admin/EditForm/field/URLSegment/FieldHolder".
|
||||||
*/
|
*/
|
||||||
|
#[\AllowDynamicProperties]
|
||||||
class Form extends ViewableData implements HasRequestHandler
|
class Form extends ViewableData implements HasRequestHandler
|
||||||
{
|
{
|
||||||
use AttributesHTML;
|
use AttributesHTML;
|
||||||
|
@ -22,6 +22,7 @@ use Exception;
|
|||||||
* You are advised to backup your tables if changing settings on an existing database
|
* You are advised to backup your tables if changing settings on an existing database
|
||||||
* `connection_charset` and `charset` should be equal, similarly so should `connection_collation` and `collation`
|
* `connection_charset` and `charset` should be equal, similarly so should `connection_collation` and `collation`
|
||||||
*/
|
*/
|
||||||
|
#[\AllowDynamicProperties]
|
||||||
class MySQLDatabase extends Database implements TransactionManager
|
class MySQLDatabase extends Database implements TransactionManager
|
||||||
{
|
{
|
||||||
use Configurable;
|
use Configurable;
|
||||||
|
5
thirdparty/php-peg/Parser.php
vendored
5
thirdparty/php-peg/Parser.php
vendored
@ -8,6 +8,7 @@
|
|||||||
* Of course, the next regex might be outside that bracket - after the bracket if other matches have progressed beyond the match position, or before
|
* Of course, the next regex might be outside that bracket - after the bracket if other matches have progressed beyond the match position, or before
|
||||||
* the bracket if a failed match + restore has moved the current position backwards - so we have to check that too.
|
* the bracket if a failed match + restore has moved the current position backwards - so we have to check that too.
|
||||||
*/
|
*/
|
||||||
|
#[\AllowDynamicProperties]
|
||||||
class ParserRegexp {
|
class ParserRegexp {
|
||||||
function __construct( $parser, $rx ) {
|
function __construct( $parser, $rx ) {
|
||||||
$this->parser = $parser ;
|
$this->parser = $parser ;
|
||||||
@ -44,6 +45,7 @@ class ParserRegexp {
|
|||||||
* - some abstraction of code that would otherwise be repeated many times in a compiled grammer, mostly related to calling user functions
|
* - some abstraction of code that would otherwise be repeated many times in a compiled grammer, mostly related to calling user functions
|
||||||
* for result construction and building
|
* for result construction and building
|
||||||
*/
|
*/
|
||||||
|
#[\AllowDynamicProperties]
|
||||||
class Parser {
|
class Parser {
|
||||||
/**
|
/**
|
||||||
* @var string
|
* @var string
|
||||||
@ -202,6 +204,7 @@ class Parser {
|
|||||||
*
|
*
|
||||||
* @author Hamish Friedlander
|
* @author Hamish Friedlander
|
||||||
*/
|
*/
|
||||||
|
#[\AllowDynamicProperties]
|
||||||
class Packrat extends Parser {
|
class Packrat extends Parser {
|
||||||
function __construct( $string ) {
|
function __construct( $string ) {
|
||||||
parent::__construct( $string ) ;
|
parent::__construct( $string ) ;
|
||||||
@ -254,6 +257,7 @@ class Packrat extends Parser {
|
|||||||
*
|
*
|
||||||
* @author Hamish Friedlander
|
* @author Hamish Friedlander
|
||||||
*/
|
*/
|
||||||
|
#[\AllowDynamicProperties]
|
||||||
class FalseOnlyPackrat extends Parser {
|
class FalseOnlyPackrat extends Parser {
|
||||||
function __construct( $string ) {
|
function __construct( $string ) {
|
||||||
parent::__construct( $string ) ;
|
parent::__construct( $string ) ;
|
||||||
@ -288,6 +292,7 @@ class FalseOnlyPackrat extends Parser {
|
|||||||
*
|
*
|
||||||
* @author Hamish Friedlander
|
* @author Hamish Friedlander
|
||||||
*/
|
*/
|
||||||
|
#[\AllowDynamicProperties]
|
||||||
class ConservativePackrat extends Parser {
|
class ConservativePackrat extends Parser {
|
||||||
function packhas( $key, $pos ) {
|
function packhas( $key, $pos ) {
|
||||||
return isset( $this->packres[$key] ) && $this->packres[$key] !== NULL ;
|
return isset( $this->packres[$key] ) && $this->packres[$key] !== NULL ;
|
||||||
|
Loading…
Reference in New Issue
Block a user