Merge branch '6.0' into 6

symbiote · Jan 8, 2025 · a811b62 · a811b62
2 parents ad9658c + a081e08
commit a811b62
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/src/DataObjects/QueuedJobDescriptor.php b/src/DataObjects/QueuedJobDescriptor.php
@@ -243,7 +243,7 @@ protected function getJobDir()
         // make sure our temp dir is in place. This is what will be inotify watched
         $jobDir = Config::inst()->get(QueuedJobService::class, 'cache_dir');
         if ($jobDir[0] !== '/') {
-            $jobDir = TEMP_FOLDER . '/' . $jobDir;
+            $jobDir = TEMP_PATH . '/' . $jobDir;
         }
 
         if (!is_dir($jobDir ?? '')) {

diff --git a/src/Jobs/DoormanQueuedJobTask.php b/src/Jobs/DoormanQueuedJobTask.php
@@ -2,7 +2,6 @@
 
 namespace Symbiote\QueuedJobs\Jobs;
 
-use SilverStripe\Dev\Deprecation;
 use AsyncPHP\Doorman\Cancellable;
 use AsyncPHP\Doorman\Expires;
 use AsyncPHP\Doorman\Process;

diff --git a/src/Services/JobErrorHandler.php b/src/Services/JobErrorHandler.php
@@ -25,14 +25,9 @@ public function clear()
     public function handleError($errno, $errstr, $errfile, $errline)
     {
         if (error_reporting()) {
-            // Don't throw E_DEPRECATED in PHP 5.3+
-            if (defined('E_DEPRECATED')) {
-                if ($errno == E_DEPRECATED || $errno == E_USER_DEPRECATED) {
-                    return;
-                }
-            }
-
             switch ($errno) {
+                case E_DEPRECATED:
+                case E_USER_DEPRECATED:
                 case E_NOTICE:
                 case E_USER_NOTICE:
                 case E_STRICT: