nystudio107 / craft-recipe

src/models/Recipe.php

Spacing +56 added lines, -56 removed lines

@@ -50,12 +50,12 @@ 
     /**
      * @var array
      */
-    public $ingredients = [];
+    public $ingredients = [ ];
 
     /**
      * @var array
      */
-    public $directions = [];
+    public $directions = [ ];
 
     /**
      * @var int
@@ -80,7 +80,7 @@ 
     /**
      * @var array
      */
-    public $ratings = [];
+    public $ratings = [ ];
 
     /**
      * @var string
@@ -151,27 +151,27 @@ 
     public function rules()
     {
         return [
-            ['name', 'string'],
-            ['name', 'default', 'value' => ''],
-            ['description', 'string'],
-            ['skill', 'string'],
-            ['serves', 'integer'],
-            ['imageId', 'integer'],
-            ['prepTime', 'integer'],
-            ['cookTime', 'integer'],
-            ['totalTime', 'integer'],
-            ['servingSize', 'string'],
-            ['calories', 'integer'],
-            ['carbohydrateContent', 'integer'],
-            ['cholesterolContent', 'integer'],
-            ['fatContent', 'integer'],
-            ['fiberContent', 'integer'],
-            ['proteinContent', 'integer'],
-            ['saturatedFatContent', 'integer'],
-            ['sodiumContent', 'integer'],
-            ['sugarContent', 'integer'],
-            ['transFatContent', 'integer'],
-            ['unsaturatedFatContent', 'integer'],
+            [ 'name', 'string' ],
+            [ 'name', 'default', 'value' => '' ],
+            [ 'description', 'string' ],
+            [ 'skill', 'string' ],
+            [ 'serves', 'integer' ],
+            [ 'imageId', 'integer' ],
+            [ 'prepTime', 'integer' ],
+            [ 'cookTime', 'integer' ],
+            [ 'totalTime', 'integer' ],
+            [ 'servingSize', 'string' ],
+            [ 'calories', 'integer' ],
+            [ 'carbohydrateContent', 'integer' ],
+            [ 'cholesterolContent', 'integer' ],
+            [ 'fatContent', 'integer' ],
+            [ 'fiberContent', 'integer' ],
+            [ 'proteinContent', 'integer' ],
+            [ 'saturatedFatContent', 'integer' ],
+            [ 'sodiumContent', 'integer' ],
+            [ 'sugarContent', 'integer' ],
+            [ 'transFatContent', 'integer' ],
+            [ 'unsaturatedFatContent', 'integer' ],
         ];
     }
 
@@ -212,9 +212,9 @@ 
             'unsaturatedFatContent' => $this->unsaturatedFatContent,
         ];
         $nutrition = array_filter($nutrition);
-        $recipeJSONLD['nutrition'] = $nutrition;
-        if (count($recipeJSONLD['nutrition']) == 1) {
-            unset($recipeJSONLD['nutrition']);
+        $recipeJSONLD[ 'nutrition' ] = $nutrition;
+        if (count($recipeJSONLD[ 'nutrition' ]) == 1) {
+            unset($recipeJSONLD[ 'nutrition' ]);
         }
         $aggregateRating = $this->getAggregateRating();
         if ($aggregateRating) {
@@ -226,36 +226,36 @@ 
                 'ratingValue' => $aggregateRating,
             ];
             $aggregateRatings = array_filter($aggregateRatings);
-            $recipeJSONLD['aggregateRating'] = $aggregateRatings;
+            $recipeJSONLD[ 'aggregateRating' ] = $aggregateRatings;
 
-            $reviews = [];
+            $reviews = [ ];
             foreach ($this->ratings as $rating) {
                 $review = [
                     "type" => "Review",
-                    'author' => $rating['author'],
+                    'author' => $rating[ 'author' ],
                     'name' => $this->name." ".Craft::t("recipe", "Review"),
-                    'description' => $rating['review'],
+                    'description' => $rating[ 'review' ],
                     'reviewRating' => [
                         "type" => "Rating",
                         'bestRating' => '5',
                         'worstRating' => '1',
-                        'ratingValue' => $rating['rating'],
+                        'ratingValue' => $rating[ 'rating' ],
                     ],
                 ];
                 array_push($reviews, $review);
             }
             $reviews = array_filter($reviews);
-            $recipeJSONLD['review'] = $reviews;
+            $recipeJSONLD[ 'review' ] = $reviews;
         }
 
         if ($this->prepTime) {
-            $recipeJSONLD['prepTime'] = "PT".$this->prepTime."M";
+            $recipeJSONLD[ 'prepTime' ] = "PT".$this->prepTime."M";
         }
         if ($this->cookTime) {
-            $recipeJSONLD['cookTime'] = "PT".$this->cookTime."M";
+            $recipeJSONLD[ 'cookTime' ] = "PT".$this->cookTime."M";
         }
         if ($this->totalTime) {
-            $recipeJSONLD['totalTime'] = "PT".$this->totalTime."M";
+            $recipeJSONLD[ 'totalTime' ] = "PT".$this->totalTime."M";
         }
 
         return $this->renderJsonLd($recipeJSONLD, $raw);
@@ -270,7 +270,7 @@ 
     {
         $result = "";
         if (isset($this->imageId) && $this->imageId) {
-            $image = Craft::$app->getAssets()->getAssetById($this->imageId[0]);
+            $image = Craft::$app->getAssets()->getAssetById($this->imageId[ 0 ]);
             if ($image) {
                 $result = $image->url;
             }
@@ -290,65 +290,65 @@ 
      */
     public function getIngredients($outputUnits = "imperial", $serving = 0, $raw = true)
     {
-        $result = [];
+        $result = [ ];
         foreach ($this->ingredients as $row) {
             $convertedUnits = "";
             $ingredient = "";
-            if ($row['quantity']) {
+            if ($row[ 'quantity' ]) {
                 // Multiply the quantity by how many servings we want
                 $multiplier = 1;
                 if ($serving > 0) {
                     $multiplier = $serving / $this->serves;
                 }
-                $quantity = $row['quantity'] * $multiplier;
+                $quantity = $row[ 'quantity' ] * $multiplier;
                 $originalQuantity = $quantity;
 
                 // Do the units conversion
 
                 if ($outputUnits == 'imperial') {
-                    if ($row['units'] == "mls") {
+                    if ($row[ 'units' ] == "mls") {
                         $convertedUnits = "tsps";
                         $quantity = $quantity * 0.2;
                     }
 
-                    if ($row['units'] == "ls") {
+                    if ($row[ 'units' ] == "ls") {
                         $convertedUnits = "cups";
                         $quantity = $quantity * 4.2;
                     }
 
-                    if ($row['units'] == "mgs") {
+                    if ($row[ 'units' ] == "mgs") {
                         $convertedUnits = "ozs";
                         $quantity = $quantity * 0.000035274;
                     }
 
-                    if ($row['units'] == "gs") {
+                    if ($row[ 'units' ] == "gs") {
                         $convertedUnits = "ozs";
                         $quantity = $quantity * 0.035274;
                     }
                 }
 
                 if ($outputUnits == 'metric') {
-                    if ($row['units'] == "tsps") {
+                    if ($row[ 'units' ] == "tsps") {
                         $convertedUnits = "mls";
                         $quantity = $quantity * 4.929;
                     }
 
-                    if ($row['units'] == "tbsps") {
+                    if ($row[ 'units' ] == "tbsps") {
                         $convertedUnits = "mls";
                         $quantity = $quantity * 14.787;
                     }
 
-                    if ($row['units'] == "flozs") {
+                    if ($row[ 'units' ] == "flozs") {
                         $convertedUnits = "mls";
                         $quantity = $quantity * 29.574;
                     }
 
-                    if ($row['units'] == "cups") {
+                    if ($row[ 'units' ] == "cups") {
                         $convertedUnits = "ls";
                         $quantity = $quantity * 0.236588;
                     }
 
-                    if ($row['units'] == "ozs") {
+                    if ($row[ 'units' ] == "ozs") {
                         $convertedUnits = "gs";
                         $quantity = $quantity * 28.3495;
                     }
@@ -363,8 +363,8 @@ 
                 }
                 $ingredient .= $quantity;
 
-                if ($row['units']) {
-                    $units = $row['units'];
+                if ($row[ 'units' ]) {
+                    $units = $row[ 'units' ];
                     if ($convertedUnits) {
                         $units = $convertedUnits;
                     }
@@ -375,8 +375,8 @@ 
                     $ingredient .= " ".$units;
                 }
             }
-            if ($row['ingredient']) {
-                $ingredient .= " ".$row['ingredient'];
+            if ($row[ 'ingredient' ]) {
+                $ingredient .= " ".$row[ 'ingredient' ];
             }
             if ($raw) {
                 $ingredient = Template::raw($ingredient);
@@ -460,9 +460,9 @@ 
      */
     public function getDirections($raw = true)
     {
-        $result = [];
+        $result = [ ];
         foreach ($this->directions as $row) {
-            $direction = $row['direction'];
+            $direction = $row[ 'direction' ];
             if ($raw) {
                 $direction = Template::raw($direction);
             }
@@ -483,7 +483,7 @@ 
         $total = 0;
         if (isset($this->ratings) && !empty($this->ratings)) {
             foreach ($this->ratings as $row) {
-                $result += $row['rating'];
+                $result += $row[ 'rating' ];
                 $total++;
             }
             $result = $result / $total;

src/Recipe.php

Spacing +4 added lines, -4 removed lines

@@ -54,8 +54,8 @@ 
         Event::on(
             Fields::class,
             Fields::EVENT_REGISTER_FIELD_TYPES,
-            function (RegisterComponentTypesEvent $event) {
-                $event->types[] = RecipeField::class;
+            function(RegisterComponentTypesEvent $event) {
+                $event->types[ ] = RecipeField::class;
             }
         );
 
@@ -63,7 +63,7 @@ 
         Event::on(
             Plugins::class,
             Plugins::EVENT_AFTER_INSTALL_PLUGIN,
-            function (PluginEvent $event) {
+            function(PluginEvent $event) {
                 if (!Craft::$app->getRequest()->getIsConsoleRequest()
                 && ($event->plugin === $this)) {
                     Craft::$app->getResponse()->redirect(UrlHelper::cpUrl('recipe/welcome'))->send();
@@ -75,7 +75,7 @@ 
             Craft::t(
                 'recipe',
                 '{name} plugin loaded',
-                ['name' => $this->name]
+                [ 'name' => $this->name ]
             ),
             __METHOD__
         );

src/fields/Recipe.php

Spacing +4 added lines, -4 removed lines

@@ -35,7 +35,7 @@ 
     /**
      * @var array
      */
-    public $assetSources = [];
+    public $assetSources = [ ];
 
     // Static Methods
     // =========================================================================
@@ -128,12 +128,12 @@ 
         Craft::$app->getView()->registerJs("$('#{$nameSpacedId}-field').RecipeRecipe(".$jsonVars.");");
 
         // Set asset elements
-        $elements = [];
+        $elements = [ ];
         if ($value->imageId) {
             if (is_array($value->imageId)) {
-                $value->imageId = $value->imageId[0];
+                $value->imageId = $value->imageId[ 0 ];
             }
-            $elements = [Craft::$app->getAssets()->getAssetById($value->imageId)];
+            $elements = [ Craft::$app->getAssets()->getAssetById($value->imageId) ];
         }
 
         // Render the input template

src/helpers/Json.php

Spacing +1 added lines, -1 removed lines

@@ -95,7 +95,7 @@
             return $array;
         }
         $keys = array_keys($array);
-        $keys[array_search($oldKey, $keys)] = $newKey;
+        $keys[ array_search($oldKey, $keys) ] = $newKey;
 
         return array_combine($keys, $array);
     }