Merge branch '5.3' into 5

silverstripe · Jun 18, 2024 · 0fe2d73 · 0fe2d73
2 parents c523885 + f2ad46e
commit 0fe2d73
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/Context/FixtureContext.php b/src/Context/FixtureContext.php
@@ -379,7 +379,7 @@ public function stepUpdateRecordRelation($type, $id, $relation, $relationType, $
      */
     public function stepIAssignObjToObj($type, $value, $relationType, $relationId)
     {
-        self::stepIAssignObjToObjInTheRelation($type, $value, $relationType, $relationId, null);
+        FixtureContext::stepIAssignObjToObjInTheRelation($type, $value, $relationType, $relationId, null);
     }
 
     /**

diff --git a/src/Extension.php b/src/Extension.php
@@ -51,7 +51,7 @@ class Extension implements ExtensionInterface
     */
     public function getConfigKey()
     {
-        return self::SILVERSTRIPE_ID;
+        return Extension::SILVERSTRIPE_ID;
     }
 
     public function initialize(ExtensionManager $extensionManager)

diff --git a/src/Utility/RetryableCallHandler.php b/src/Utility/RetryableCallHandler.php
@@ -183,10 +183,10 @@ protected function isCallRetryable(Call $call)
             return false;
         }
         $feature = $call->getFeature();
-        if ($feature->hasTag(self::RETRY_TAG)) {
+        if ($feature->hasTag(RetryableCallHandler::RETRY_TAG)) {
             return true;
         }
         $scenario = $this->getStepScenario($feature, $call->getStep());
-        return $scenario && $scenario->hasTag(self::RETRY_TAG);
+        return $scenario && $scenario->hasTag(RetryableCallHandler::RETRY_TAG);
     }
 }
-Original file line number
+Diff line change
@@ Expand Up @@
          */
         public function stepIAssignObjToObj($type, $value, $relationType, $relationId)
         {
-            self::stepIAssignObjToObjInTheRelation($type, $value, $relationType, $relationId, null);
+            FixtureContext::stepIAssignObjToObjInTheRelation($type, $value, $relationType, $relationId, null);
         }
         /**
@@ Expand Down @@