Revert php version requirement bump, Craft still is on v7.0

sebastian-lenz · Dec 2, 2020 · a1db66e · a1db66e
1 parent 9c0c150
commit a1db66e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -3,7 +3,7 @@
   "description": "A collection of utility classes for Craft CMS development",
   "license": "MIT",
   "require": {
-    "php": ">=7.4",
+    "php": ">=7.0.0",
     "craftcms/cms": "^3.2.4"
   },
   "autoload": {

diff --git a/src/foreignField/ForeignField.php b/src/foreignField/ForeignField.php
@@ -94,6 +94,7 @@ public function getStaticHtml($value, ElementInterface $element): string {
   /**
    * @param string $attribute
    * @return bool
+   * @noinspection PhpUnusedParameterInspection
    */
   public function isAttributePropagated(string $attribute) {
     return true;
@@ -341,6 +342,7 @@ protected function render(string $template, array $variables) {
    * @param ForeignFieldModel $model
    * @param ElementInterface $element
    * @return bool
+   * @noinspection PhpUnusedParameterInspection
    */
   protected function shouldUpdateRecord(ForeignFieldModel $model, ElementInterface $element) {
     if (
@@ -358,6 +360,7 @@ protected function shouldUpdateRecord(ForeignFieldModel $model, ElementInterface
    * @param ActiveRecord $record
    * @param ElementInterface|null $element
    * @return array
+   * @noinspection PhpUnusedParameterInspection
    */
   protected function toModelAttributes(ActiveRecord $record, ElementInterface $element = null) {
     return $record->getAttributes(static::recordModelAttributes());
@@ -367,6 +370,7 @@ protected function toModelAttributes(ActiveRecord $record, ElementInterface $ele
    * @param ForeignFieldModel $model
    * @param ElementInterface $element
    * @return array
+   * @noinspection PhpUnusedParameterInspection
    */
   protected function toRecordAttributes(ForeignFieldModel $model, ElementInterface $element) {
     return $model->getAttributes(static::recordModelAttributes());

diff --git a/src/foreignField/ForeignFieldModel.php b/src/foreignField/ForeignFieldModel.php
@@ -116,7 +116,7 @@ public function unserialize($value) {
    * @param ElementInterface|null $owner
    * @return $this
    */
-  public function withOwner(?ElementInterface $owner) {
+  public function withOwner(ElementInterface $owner = null) {
     if ($this->_owner === $owner) {
       return $this;
     }

diff --git a/src/helpers/ElementHelpers.php b/src/helpers/ElementHelpers.php
@@ -5,6 +5,7 @@
 use Craft;
 use craft\base\ElementInterface;
 use craft\helpers\ArrayHelper;
+use Throwable;
 
 /**
  * Class ElementHelpers
@@ -25,7 +26,7 @@ static public function serialize(ElementInterface $element = null) {
       if (!empty($element->siteId)) {
         $siteId = intval($element->siteId);
       }
-    } catch (\Throwable $error) {
+    } catch (Throwable $error) {
       // Ignore
     }