Merge 88a1f0362f465bbd5ff4d8d55242b3b69ae7e81e into c523022cb9d52cb8c2567127844f7e16be63cb77

- Turn sake into a symfony/console app
- Avoid using HTTPRequest for CLI interaction
- Implement abstract hybrid execution path

src/Dev/BuildTask.php

@@ -39,8 +39,8 @@ abstract class BuildTask extends PolyCommand
 
     private static array $permissions_for_browser_execution = [
         'ADMIN',
-        'anyone_with_dev_admin_permissions' => 'ALL_DEV_ADMIN',
+        'ALL_DEV_ADMIN' => true,
-        'anyone_with_task_permissions' => 'BUILDTASK_CAN_RUN',
+        'BUILDTASK_CAN_RUN' => true,
     ];
 
     public function __construct()

src/Dev/Command/DevCommand.php

@@ -14,7 +14,7 @@ abstract class DevCommand extends PolyCommand
 {
     private static array $permissions_for_browser_execution = [
         'ADMIN',
-        'anyone_with_dev_admin_permissions' => 'ALL_DEV_ADMIN',
+        'ALL_DEV_ADMIN' => true,
     ];
 
     public function run(InputInterface $input, PolyOutput $output): int

src/Dev/Deprecation.php

@@ -53,7 +53,7 @@ class Deprecation
     /**
      * @internal
      */
-    private static bool $insideWithNoReplacement = false;
+    private static bool $insideNoticeSuppression = false;
 
     /**
      * @internal
@@ -103,22 +103,32 @@ class Deprecation
     }
 
     /**
-     * Used to wrap deprecated methods and deprecated config get()/set() that will be removed
+     * Used to wrap deprecated methods and deprecated config get()/set() called from the vendor
-     * in the next major version with no replacement. This is done to surpress deprecation notices
+     * dir that projects have no ability to change.
-     * by for calls from the vendor dir to deprecated code that projects have no ability to change
      *
      * @return mixed
+     * @deprecated 5.4.0 Use withSuppressedNotice() instead
      */
     public static function withNoReplacement(callable $func)
     {
-        if (Deprecation::$insideWithNoReplacement) {
+        Deprecation::notice('5.4.0', 'Use withSuppressedNotice() instead');
+        return Deprecation::withSuppressedNotice($func);
+    }
+
+    /**
+     * Used to wrap deprecated methods and deprecated config get()/set() called from the vendor
+     * dir that projects have no ability to change.
+     */
+    public static function withSuppressedNotice(callable $func): mixed
+    {
+        if (Deprecation::$insideNoticeSuppression) {
             return $func();
         }
-        Deprecation::$insideWithNoReplacement = true;
+        Deprecation::$insideNoticeSuppression = true;
         try {
             return $func();
         } finally {
-            Deprecation::$insideWithNoReplacement = false;
+            Deprecation::$insideNoticeSuppression = false;
         }
     }
 
@@ -137,8 +147,8 @@ class Deprecation
             $level = 1;
         }
         $newLevel = $level;
-        // handle closures inside withNoReplacement()
+        // handle closures inside withSuppressedNotice()
-        if (Deprecation::$insideWithNoReplacement
+        if (Deprecation::$insideNoticeSuppression
             && substr($backtrace[$newLevel]['function'], -strlen('{closure}')) === '{closure}'
         ) {
             $newLevel = $newLevel + 2;
@@ -247,8 +257,8 @@ class Deprecation
             $count++;
             $arr = array_shift(Deprecation::$userErrorMessageBuffer);
             $message = $arr['message'];
-            $calledInsideWithNoReplacement = $arr['calledInsideWithNoReplacement'];
+            $calledWithNoticeSuppression = $arr['calledWithNoticeSuppression'];
-            if ($calledInsideWithNoReplacement && !Deprecation::$showNoReplacementNotices) {
+            if ($calledWithNoticeSuppression && !Deprecation::$showNoReplacementNotices) {
                 continue;
             }
             Deprecation::$isTriggeringError = true;
@@ -284,7 +294,7 @@ class Deprecation
                 $data = [
                     'key' => sha1($string),
                     'message' => $string,
-                    'calledInsideWithNoReplacement' => Deprecation::$insideWithNoReplacement
+                    'calledWithNoticeSuppression' => Deprecation::$insideNoticeSuppression
                 ];
             } else {
                 if (!Deprecation::isEnabled()) {
@@ -310,7 +320,7 @@ class Deprecation
                     $string .= ".";
                 }
 
-                $level = Deprecation::$insideWithNoReplacement ? 4 : 2;
+                $level = Deprecation::$insideNoticeSuppression ? 4 : 2;
                 $string .= " Called from " . Deprecation::get_called_method_from_trace($backtrace, $level) . '.';
 
                 if ($caller) {
@@ -319,7 +329,7 @@ class Deprecation
                 $data = [
                     'key' => sha1($string),
                     'message' => $string,
-                    'calledInsideWithNoReplacement' => Deprecation::$insideWithNoReplacement
+                    'calledWithNoticeSuppression' => Deprecation::$insideNoticeSuppression
                 ];
             }
             if ($data && !array_key_exists($data['key'], Deprecation::$userErrorMessageBuffer)) {

src/Dev/Tasks/CleanupTestDatabasesTask.php

@@ -21,8 +21,8 @@ class CleanupTestDatabasesTask extends BuildTask
     protected static string $description = 'Cleans up leftover databases from aborted test executions (starting with ss_tmpdb)';
 
     private static array $permissions_for_browser_execution = [
-        'anyone_with_dev_admin_permissions' => null,
+        'ALL_DEV_ADMIN' => false,
-        'anyone_with_task_permissions' => null,
+        'BUILDTASK_CAN_RUN' => false,
     ];
 
     protected function execute(InputInterface $input, PolyOutput $output): int

src/Forms/GridField/GridFieldConfig_Base.php

@@ -25,7 +25,7 @@ class GridFieldConfig_Base extends GridFieldConfig
         $this->addComponent(GridFieldPageCount::create('toolbar-header-right'));
         $this->addComponent($pagination = GridFieldPaginator::create($itemsPerPage));
 
-        Deprecation::withNoReplacement(function () use ($sort, $filter, $pagination) {
+        Deprecation::withSuppressedNotice(function () use ($sort, $filter, $pagination) {
             $sort->setThrowExceptionOnBadDataType(false);
             $filter->setThrowExceptionOnBadDataType(false);
             $pagination->setThrowExceptionOnBadDataType(false);

src/Forms/GridField/GridFieldConfig_RecordEditor.php

@@ -32,7 +32,7 @@ class GridFieldConfig_RecordEditor extends GridFieldConfig
         $this->addComponent($pagination = GridFieldPaginator::create($itemsPerPage));
         $this->addComponent(GridFieldDetailForm::create(null, $showPagination, $showAdd));
 
-        Deprecation::withNoReplacement(function () use ($sort, $filter, $pagination) {
+        Deprecation::withSuppressedNotice(function () use ($sort, $filter, $pagination) {
             $sort->setThrowExceptionOnBadDataType(false);
             $filter->setThrowExceptionOnBadDataType(false);
             $pagination->setThrowExceptionOnBadDataType(false);

src/Forms/GridField/GridFieldConfig_RelationEditor.php

@@ -45,7 +45,7 @@ class GridFieldConfig_RelationEditor extends GridFieldConfig
         $this->addComponent($pagination = GridFieldPaginator::create($itemsPerPage));
         $this->addComponent(GridFieldDetailForm::create());
 
-        Deprecation::withNoReplacement(function () use ($sort, $filter, $pagination) {
+        Deprecation::withSuppressedNotice(function () use ($sort, $filter, $pagination) {
             $sort->setThrowExceptionOnBadDataType(false);
             $filter->setThrowExceptionOnBadDataType(false);
             $pagination->setThrowExceptionOnBadDataType(false);

src/Logging/ErrorOutputHandler.php

@@ -4,6 +4,7 @@ namespace SilverStripe\Logging;
 
 use Monolog\Formatter\FormatterInterface;
 use Monolog\Handler\AbstractProcessingHandler;
+use Monolog\Level;
 use Monolog\LogRecord;
 use SilverStripe\Control\Controller;
 use SilverStripe\Control\Director;
@@ -31,10 +32,10 @@ class ErrorOutputHandler extends AbstractProcessingHandler
      */
     private $cliFormatter = null;
 
-    public function __construct()
+    public function __construct(int|string|Level $level = Level::Debug, bool $bubble = true)
     {
-        parent::__construct();
+        parent::__construct($level, $bubble);
-        Deprecation::withNoReplacement(function () {
+        Deprecation::withSuppressedNotice(function () {
             Deprecation::notice(
                 '5.4.0',
                 'Will be renamed to ErrorOutputHandler',

src/Model/List/ArrayList.php

@@ -720,7 +720,7 @@ class ArrayList extends ModelData implements SS_List, Filterable, Sortable, Limi
 
             // Apply default case sensitivity for backwards compatability
             if (!str_contains($filterKey, ':case') && !str_contains($filterKey, ':nocase')) {
-                $caseSensitive = Deprecation::withNoReplacement(fn() => static::config()->get('default_case_sensitive'));
+                $caseSensitive = Deprecation::withSuppressedNotice(fn() => static::config()->get('default_case_sensitive'));
                 if ($caseSensitive && in_array('case', $searchFilter->getSupportedModifiers())) {
                     $searchFilter->setModifiers($searchFilter->getModifiers() + ['case']);
                 } elseif (!$caseSensitive && in_array('nocase', $searchFilter->getSupportedModifiers())) {

src/ORM/Connect/MySQLiConnector.php

@@ -6,6 +6,7 @@ use mysqli;
 use mysqli_sql_exception;
 use mysqli_stmt;
 use SilverStripe\Core\Config\Config;
+use SilverStripe\Core\Environment;
 
 /**
  * Connector for MySQL using the MySQLi method
@@ -81,15 +82,21 @@ class MySQLiConnector extends DBConnector
         // Connection charset and collation
         $connCharset = Config::inst()->get(MySQLDatabase::class, 'connection_charset');
         $connCollation = Config::inst()->get(MySQLDatabase::class, 'connection_collation');
+        $socket = Environment::getEnv('SS_DATABASE_SOCKET');
+        $flags = Environment::getEnv('SS_DATABASE_FLAGS');
+
+        $flags = $flags ? array_reduce(explode(',', $flags), function ($carry, $item) {
+            $item = trim($item);
+            return $carry | constant($item);
+        }, 0) : $flags;
 
         $this->dbConn = mysqli_init();
 
         // Use native types (MysqlND only)
         if (defined('MYSQLI_OPT_INT_AND_FLOAT_NATIVE')) {
             $this->dbConn->options(MYSQLI_OPT_INT_AND_FLOAT_NATIVE, true);
-
-        // The alternative is not ideal, throw a notice-level error
         } else {
+            // The alternative is not ideal, throw a notice-level error
             user_error(
                 'mysqlnd PHP library is not available, numeric values will be fetched from the DB as strings',
                 E_USER_NOTICE
@@ -117,7 +124,9 @@ class MySQLiConnector extends DBConnector
             $parameters['username'],
             $parameters['password'],
             $selectedDB,
-            !empty($parameters['port']) ? $parameters['port'] : ini_get("mysqli.default_port")
+            !empty($parameters['port']) ? $parameters['port'] : ini_get("mysqli.default_port"),
+            $socket ?? null,
+            $flags ?? 0
         );
 
         if ($this->dbConn->connect_error) {

src/ORM/DataObject.php

@@ -1982,7 +1982,7 @@ class DataObject extends ModelData implements DataObjectInterface, i18nEntityPro
         if ($details['polymorphic']) {
             $result = PolymorphicHasManyList::create($componentClass, $details['joinField'], static::class);
             if ($details['needsRelation']) {
-                Deprecation::withNoReplacement(fn () => $result->setForeignRelation($componentName));
+                Deprecation::withSuppressedNotice(fn () => $result->setForeignRelation($componentName));
             }
         } else {
             $result = HasManyList::create($componentClass, $details['joinField']);

src/PolyExecution/PolyCommand.php

@@ -43,6 +43,10 @@ abstract class PolyCommand
      * Users must have at least one of these permissions to run the command in an HTTP request.
      * If `can_run_in_browser` is false, these permissions are ignored.
      * Must be defined in the subclass.
+     *
+     * If permissions are set as keys, the value must be boolean, indicating whether to check
+     * that permission or not. This is useful for allowing developers to turn off permission checks
+     * that aren't valid for their project or for their subclass.
      */
     private static array $permissions_for_browser_execution = [];
 
@@ -162,8 +166,18 @@ abstract class PolyCommand
         }
         // Check permissions if there are any
         $permissions = static::config()->get('permissions_for_browser_execution');
-        if ($permissions) {
+        if (!empty($permissions)) {
-            return Permission::check($permissions);
+            $usePermissions = [];
+            // Only use permissions that aren't set to false
+            // Allow permissions to also be simply set as values, for simplicity
+            foreach ($permissions as $key => $value) {
+                if (is_string($value)) {
+                    $usePermissions[] = $value;
+                } elseif ($value) {
+                    $usePermissions[] = $key;
+                }
+            }
+            return Permission::check($usePermissions);
         }
         return true;
     }

src/Security/MemberAuthenticator/CookieAuthenticationHandler.php

@@ -176,7 +176,7 @@ class CookieAuthenticationHandler implements AuthenticationHandler
         }
 
         // Renew the token
-        Deprecation::withNoReplacement(fn() => $rememberLoginHash->renew());
+        Deprecation::withSuppressedNotice(fn() => $rememberLoginHash->renew());
 
         // Send the new token to the client if it was changed
         if ($rememberLoginHash->getToken()) {

src/View/SSViewer_DataPresenter.php

@@ -434,7 +434,7 @@ class SSViewer_DataPresenter extends SSViewer_Scope
             return $value;
         }
 
-        // Wrap list arrays in ViewableData so templates can handle them
+        // Wrap list arrays in ModelData so templates can handle them
         if (is_array($value) && array_is_list($value)) {
             return ArrayList::create($value);
         }

tests/php/Dev/DeprecationTest.php

@@ -116,72 +116,72 @@ class DeprecationTest extends SapphireTest
         Deprecation::outputNotices();
     }
 
-    public function testWithNoReplacementDefault()
+    public function testwithSuppressedNoticeDefault()
     {
         Deprecation::enable();
-        $ret = Deprecation::withNoReplacement(function () {
+        $ret = Deprecation::withSuppressedNotice(function () {
             return $this->myDeprecatedMethod();
         });
         $this->assertSame('abc', $ret);
         Deprecation::outputNotices();
     }
 
-    public function testWithNoReplacementTrue()
+    public function testwithSuppressedNoticeTrue()
     {
         $message = implode(' ', [
             'SilverStripe\Dev\Tests\DeprecationTest->myDeprecatedMethod is deprecated.',
             'My message.',
-            'Called from SilverStripe\Dev\Tests\DeprecationTest->testWithNoReplacementTrue.'
+            'Called from SilverStripe\Dev\Tests\DeprecationTest->testwithSuppressedNoticeTrue.'
         ]);
         $this->expectException(DeprecationTestException::class);
         $this->expectExceptionMessage($message);
         Deprecation::enable(true);
-        $ret = Deprecation::withNoReplacement(function () {
+        $ret = Deprecation::withSuppressedNotice(function () {
             return $this->myDeprecatedMethod();
         });
         $this->assertSame('abc', $ret);
         Deprecation::outputNotices();
     }
 
-    public function testWithNoReplacementTrueCallUserFunc()
+    public function testwithSuppressedNoticeTrueCallUserFunc()
     {
         $message = implode(' ', [
             'SilverStripe\Dev\Tests\DeprecationTest->myDeprecatedMethod is deprecated.',
             'My message.',
-            'Called from SilverStripe\Dev\Tests\DeprecationTest->testWithNoReplacementTrueCallUserFunc.'
+            'Called from SilverStripe\Dev\Tests\DeprecationTest->testwithSuppressedNoticeTrueCallUserFunc.'
         ]);
         $this->expectException(DeprecationTestException::class);
         $this->expectExceptionMessage($message);
         Deprecation::enable(true);
-        $ret = Deprecation::withNoReplacement(function () {
+        $ret = Deprecation::withSuppressedNotice(function () {
             return call_user_func([$this, 'myDeprecatedMethod']);
         });
         $this->assertSame('abc', $ret);
         Deprecation::outputNotices();
     }
 
-    public function testNoticeWithNoReplacementTrue()
+    public function testNoticewithSuppressedNoticeTrue()
     {
         $message = implode(' ', [
-            'SilverStripe\Dev\Tests\DeprecationTest->testNoticeWithNoReplacementTrue is deprecated.',
+            'SilverStripe\Dev\Tests\DeprecationTest->testNoticewithSuppressedNoticeTrue is deprecated.',
             'My message.',
             'Called from PHPUnit\Framework\TestCase->runTest.'
         ]);
         $this->expectException(DeprecationTestException::class);
         $this->expectExceptionMessage($message);
         Deprecation::enable(true);
-        Deprecation::withNoReplacement(function () {
+        Deprecation::withSuppressedNotice(function () {
             Deprecation::notice('123', 'My message.');
         });
         Deprecation::outputNotices();
     }
 
-    public function testClassWithNoReplacement()
+    public function testClasswithSuppressedNotice()
     {
         $message = implode(' ', [
             'SilverStripe\Dev\Tests\DeprecationTest\DeprecationTestObject is deprecated.',
             'Some class message.',
-            'Called from SilverStripe\Dev\Tests\DeprecationTest->testClassWithNoReplacement.'
+            'Called from SilverStripe\Dev\Tests\DeprecationTest->testClasswithSuppressedNotice.'
         ]);
         $this->expectException(DeprecationTestException::class);
         $this->expectExceptionMessage($message);
@@ -193,12 +193,12 @@ class DeprecationTest extends SapphireTest
         Deprecation::outputNotices();
     }
 
-    public function testClassWithInjectorWithNoReplacement()
+    public function testClassWithInjectorwithSuppressedNotice()
     {
         $message = implode(' ', [
             'SilverStripe\Dev\Tests\DeprecationTest\DeprecationTestObject is deprecated.',
             'Some class message.',
-            'Called from SilverStripe\Dev\Tests\DeprecationTest->testClassWithInjectorWithNoReplacement.'
+            'Called from SilverStripe\Dev\Tests\DeprecationTest->testClassWithInjectorwithSuppressedNotice.'
         ]);
         $this->expectException(DeprecationTestException::class);
         $this->expectExceptionMessage($message);

tests/php/Dev/DeprecationTest/DeprecationTestObject.php

@@ -11,7 +11,7 @@ class DeprecationTestObject extends DataObject implements TestOnly
     public function __construct()
     {
         parent::__construct();
-        Deprecation::withNoReplacement(function () {
+        Deprecation::withSuppressedNotice(function () {
             Deprecation::notice(
                 '1.2.3',
                 'Some class message',

tests/php/Security/PasswordEncryptorTest.php

@@ -156,7 +156,7 @@ class PasswordEncryptorTest extends SapphireTest
             'encryptors',
             ['test_sha1legacy' => [PasswordEncryptor_LegacyPHPHash::class => 'sha1']]
         );
-        $e = Deprecation::withNoReplacement(fn() => PasswordEncryptor::create_for_algorithm('test_sha1legacy'));
+        $e = Deprecation::withSuppressedNotice(fn() => PasswordEncryptor::create_for_algorithm('test_sha1legacy'));
         // precomputed hashes for 'mypassword' from different architectures
         $amdHash = 'h1fj0a6m4o6k0sosks88oo08ko4gc4s';
         $intelHash = 'h1fj0a6m4o0g04ocg00o4kwoc4wowws';

tests/php/Security/RememberLoginHashTest.php

@@ -111,7 +111,7 @@ class RememberLoginHashTest extends SapphireTest
 
         $member = $this->objFromFixture(Member::class, 'main');
 
-        Deprecation::withNoReplacement(
+        Deprecation::withSuppressedNotice(
             fn() => RememberLoginHash::config()->set('replace_token_during_session_renewal', $replaceToken)
         );
 
@@ -122,7 +122,7 @@ class RememberLoginHashTest extends SapphireTest
         // Fetch the token from the DB - otherwise we still have the token from when this was originally created
         $storedHash = RememberLoginHash::get()->find('ID', $hash->ID);
 
-        Deprecation::withNoReplacement(fn() => $storedHash->renew());
+        Deprecation::withSuppressedNotice(fn() => $storedHash->renew());
 
         if ($replaceToken) {
             $this->assertNotEquals($oldToken, $storedHash->getToken());

tests/php/View/SSViewerTest.php

@@ -2370,14 +2370,14 @@ EOC;
 
     public function testLoopingThroughArrayInOverlay(): void
     {
-        $viewableData = new ViewableData();
+        $modelData = new ModelData();
         $theArray = [
             ['Val' => 'one'],
             ['Val' => 'two'],
             ['Val' => 'red'],
             ['Val' => 'blue'],
         ];
-        $output = $viewableData->renderWith('SSViewerTestLoopArray', ['MyArray' => $theArray]);
+        $output = $modelData->renderWith('SSViewerTestLoopArray', ['MyArray' => $theArray]);
         $this->assertEqualIgnoringWhitespace('one two red blue', $output);
     }
 }