rtconner / laravel-tagging

migrations/2014_01_07_073615_create_tagged_table.php

Indentation +16 added lines, -16 removed lines

@@ -5,21 +5,21 @@
 
 class CreateTaggedTable extends Migration {
 
-	public function up() {
-		Schema::create('tagging_tagged', function(Blueprint $table) {
-			$table->increments('id');
-			if(config('tagging.primary_keys_type') == 'string') {
-				$table->string('taggable_id', 36)->index();
-			} else {
-				$table->integer('taggable_id')->unsigned()->index();
-			}
-			$table->string('taggable_type', 125)->index();
-			$table->string('tag_name', 125);
-			$table->string('tag_slug', 125)->index();
-		});
-	}
+    public function up() {
+        Schema::create('tagging_tagged', function(Blueprint $table) {
+            $table->increments('id');
+            if(config('tagging.primary_keys_type') == 'string') {
+                $table->string('taggable_id', 36)->index();
+            } else {
+                $table->integer('taggable_id')->unsigned()->index();
+            }
+            $table->string('taggable_type', 125)->index();
+            $table->string('tag_name', 125);
+            $table->string('tag_slug', 125)->index();
+        });
+    }
 
-	public function down() {
-		Schema::drop('tagging_tagged');
-	}
+    public function down() {
+        Schema::drop('tagging_tagged');
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 	public function up() {
 		Schema::create('tagging_tagged', function(Blueprint $table) {
 			$table->increments('id');
-			if(config('tagging.primary_keys_type') == 'string') {
+			if (config('tagging.primary_keys_type') == 'string') {
 				$table->string('taggable_id', 36)->index();
 			} else {
 				$table->integer('taggable_id')->unsigned()->index();

migrations/2016_06_29_073615_update_tags_table.php

Indentation +14 added lines, -14 removed lines

@@ -5,22 +5,22 @@
 
 class UpdateTagsTable extends Migration {
 
-	public function up()
-	{
-		Schema::table('tagging_tags', function ($table) {
-			$table->integer('tag_group_id')->unsigned()->nullable()->after('id');
-			$table->foreign('tag_group_id')->references('id')->on('tagging_tag_groups');
-		});
+    public function up()
+    {
+        Schema::table('tagging_tags', function ($table) {
+            $table->integer('tag_group_id')->unsigned()->nullable()->after('id');
+            $table->foreign('tag_group_id')->references('id')->on('tagging_tag_groups');
+        });
 
-	}
+    }
 
 
-	public function down()
-	{
+    public function down()
+    {
         Schema::disableForeignKeyConstraints();
-		Schema::table('tagging_tags', function ($table) {
-			$table->dropForeign('tagging_tags_tag_group_id_foreign');
-			$table->dropColumn('tag_group_id');
-		});
-	}
+        Schema::table('tagging_tags', function ($table) {
+            $table->dropForeign('tagging_tags_tag_group_id_foreign');
+            $table->dropColumn('tag_group_id');
+        });
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -7,7 +7,7 @@ 
 
 	public function up()
 	{
-		Schema::table('tagging_tags', function ($table) {
+		Schema::table('tagging_tags', function($table) {
 			$table->integer('tag_group_id')->unsigned()->nullable()->after('id');
 			$table->foreign('tag_group_id')->references('id')->on('tagging_tag_groups');
 		});
@@ -18,7 +18,7 @@ 
 	public function down()
 	{
         Schema::disableForeignKeyConstraints();
-		Schema::table('tagging_tags', function ($table) {
+		Schema::table('tagging_tags', function($table) {
 			$table->dropForeign('tagging_tags_tag_group_id_foreign');
 			$table->dropColumn('tag_group_id');
 		});

migrations/2014_01_07_073615_create_tags_table.php

Indentation +14 added lines, -14 removed lines

@@ -5,19 +5,19 @@
 
 class CreateTagsTable extends Migration
 {
-	public function up()
-	{
-		Schema::create('tagging_tags', function(Blueprint $table) {
-			$table->increments('id');
-			$table->string('slug', 125)->index();
-			$table->string('name', 125);
-			$table->boolean('suggest')->default(false);
-			$table->integer('count')->unsigned()->default(0); // count of how many times this tag was used
-		});
-	}
+    public function up()
+    {
+        Schema::create('tagging_tags', function(Blueprint $table) {
+            $table->increments('id');
+            $table->string('slug', 125)->index();
+            $table->string('name', 125);
+            $table->boolean('suggest')->default(false);
+            $table->integer('count')->unsigned()->default(0); // count of how many times this tag was used
+        });
+    }
 
-	public function down()
-	{
-		Schema::drop('tagging_tags');
-	}
+    public function down()
+    {
+        Schema::drop('tagging_tags');
+    }
 }

migrations/2016_06_29_073615_create_tag_groups_table.php

Indentation +12 added lines, -12 removed lines

@@ -5,17 +5,17 @@
 
 class CreateTagGroupsTable extends Migration {
 
-	public function up()
-	{
-		Schema::create('tagging_tag_groups', function(Blueprint $table) {
-			$table->increments('id');
-			$table->string('slug', 125)->index();
-			$table->string('name', 125);
-		});
-	}
+    public function up()
+    {
+        Schema::create('tagging_tag_groups', function(Blueprint $table) {
+            $table->increments('id');
+            $table->string('slug', 125)->index();
+            $table->string('name', 125);
+        });
+    }
 
-	public function down()
-	{
-		Schema::drop('tagging_tag_groups');
-	}
+    public function down()
+    {
+        Schema::drop('tagging_tag_groups');
+    }
 }

src/Taggable.php

Spacing +17 added lines, -17 removed lines

@@ -43,13 +43,13 @@ 
      */
     public static function bootTaggable()
     {
-        if(static::untagOnDelete()) {
+        if (static::untagOnDelete()) {
             static::deleting(function($model) {
                 $model->untag();
             });
         }
 
-        static::saved(function ($model) {
+        static::saved(function($model) {
             $model->autoTagPostSave();
         });
     }
@@ -74,7 +74,7 @@ 
      */
     public function getTagsAttribute()
     {
-        return $this->tagged->map(function(Tagged $item){
+        return $this->tagged->map(function(Tagged $item) {
             return $item->tag;
         });
     }
@@ -96,7 +96,7 @@ 
     {
         $tagNames = TaggingUtility::makeTagArray($tagNames);
 
-        foreach($tagNames as $tagName) {
+        foreach ($tagNames as $tagName) {
             $this->addTag($tagName);
         }
     }
@@ -108,7 +108,7 @@ 
      */
     public function tagNames(): array
     {
-        return $this->tagged->map(function($item){
+        return $this->tagged->map(function($item) {
             return $item->tag_name;
         })->toArray();
     }
@@ -120,7 +120,7 @@ 
      */
     public function tagSlugs(): array
     {
-        return $this->tagged->map(function($item){
+        return $this->tagged->map(function($item) {
             return $item->tag_slug;
         })->toArray();
     }
@@ -130,19 +130,19 @@ 
      *
      * @param string|array|null $tagNames (or null to remove all tags)
      */
-    public function untag($tagNames=null)
+    public function untag($tagNames = null)
     {
-        if(is_null($tagNames)) {
+        if (is_null($tagNames)) {
             $tagNames = $this->tagNames();
         }
 
         $tagNames = TaggingUtility::makeTagArray($tagNames);
 
-        foreach($tagNames as $tagName) {
+        foreach ($tagNames as $tagName) {
             $this->removeTag($tagName);
         }
 
-        if(static::shouldDeleteUnused()) {
+        if (static::shouldDeleteUnused()) {
             TaggingUtility::deleteUnusedTags();
         }
     }
@@ -162,7 +162,7 @@ 
 
         $this->untag($deletions);
 
-        foreach($additions as $tagName) {
+        foreach ($additions as $tagName) {
             $this->addTag($tagName);
         }
     }
@@ -176,7 +176,7 @@ 
      */
     public function scopeWithAllTags(Builder $query, $tagNames): Builder
     {
-        if(!is_array($tagNames)) {
+        if (!is_array($tagNames)) {
             $tagNames = func_get_args();
             array_shift($tagNames);
         }
@@ -185,7 +185,7 @@ 
 
         $className = $query->getModel()->getMorphClass();
 
-        foreach($tagNames as $tagSlug) {
+        foreach ($tagNames as $tagSlug) {
             $tags = Tagged::query()
                 ->where('tag_slug', TaggingUtility::normalize($tagSlug))
                 ->where('taggable_type', $className)
@@ -236,14 +236,14 @@ 
     {
         $tagName = trim($tagName);
 
-        if(strlen($tagName) == 0) {
+        if (strlen($tagName) == 0) {
             return;
         }
 
         $tagSlug = TaggingUtility::normalize($tagName);
 
         $previousCount = $this->tagged()->where('tag_slug', '=', $tagSlug)->take(1)->count();
-        if($previousCount >= 1) { return; }
+        if ($previousCount >= 1) { return; }
 
         $tagged = new Tagged([
             'tag_name' => TaggingUtility::displayize($tagName),
@@ -269,7 +269,7 @@ 
 
         $tagSlug = TaggingUtility::normalize($tagName);
 
-        if($count = $this->tagged()->where('tag_slug', '=', $tagSlug)->delete()) {
+        if ($count = $this->tagged()->where('tag_slug', '=', $tagSlug)->delete()) {
             TaggingUtility::decrementCount($tagName, $tagSlug, $count);
         }
 
@@ -358,7 +358,7 @@ 
 
     private function assembleTagsForScoping($query, $tagNames)
     {
-        if(!is_array($tagNames)) {
+        if (!is_array($tagNames)) {
             $tagNames = func_get_args();
             array_shift($tagNames);
         }

src/Console/Commands/GenerateTagGroup.php

Spacing +1 added lines, -1 removed lines

@@ -37,6 +37,6 @@
 
         $tagGroup->save();
 
-        $this->info('Created tag group: ' . $groupName);
+        $this->info('Created tag group: '.$groupName);
     }
 }

src/TaggingUtility.php

Indentation +5 added lines, -5 removed lines

@@ -155,11 +155,11 @@
                 'ỹ' => 'y', 'Ỹ' => 'Y', 'ỵ' => 'y', 'Ỵ' => 'Y',
             
                 //Kurdish
-				'ا' => 'a', 'ب' => 'b', 'ج' => 'c', 'د' => 'd', 'ێ' => 'ee', 'ف' => 'f', 'گ' => 'g',
-				'ژ' => 'j', 'ک' => 'k', 'ل' => 'l', 'م' => 'm', 'ن' => 'n', 'ۆ' => 'o',
-				'پ' => 'p', 'ق' => 'q', 'ر' => 'r', 'س' => 's', 'ت' => 't', 'ڤ' => 'v', 'و' => 'w',
-				'خ' => 'x', 'ی' => 'y', 'ز' => 'z', 'ڕ' => 'rr', 'ە' => 'e', 'ح' => 'hh', 'ع' => 'a', 'ش' => 'sh', 'غ' => 'gh', 'ك' => 'k',
-				'ڵ' => 'll', 'چ' => 'ch', 'ھ' => 'h', "ئ" => ''
+                'ا' => 'a', 'ب' => 'b', 'ج' => 'c', 'د' => 'd', 'ێ' => 'ee', 'ف' => 'f', 'گ' => 'g',
+                'ژ' => 'j', 'ک' => 'k', 'ل' => 'l', 'م' => 'm', 'ن' => 'n', 'ۆ' => 'o',
+                'پ' => 'p', 'ق' => 'q', 'ر' => 'r', 'س' => 's', 'ت' => 't', 'ڤ' => 'v', 'و' => 'w',
+                'خ' => 'x', 'ی' => 'y', 'ز' => 'z', 'ڕ' => 'rr', 'ە' => 'e', 'ح' => 'hh', 'ع' => 'a', 'ش' => 'sh', 'غ' => 'gh', 'ك' => 'k',
+                'ڵ' => 'll', 'چ' => 'ch', 'ھ' => 'h', "ئ" => ''
         ];
 
         // Make custom replacements

Spacing +12 added lines, -12 removed lines

@@ -18,13 +18,13 @@ 
      */
     public static function makeTagArray($tagNames)
     {
-        if(is_array($tagNames) && count($tagNames) == 1) {
+        if (is_array($tagNames) && count($tagNames) == 1) {
             $tagNames = reset($tagNames);
         }
 
-        if(is_string($tagNames)) {
+        if (is_string($tagNames)) {
             $tagNames = explode(',', $tagNames);
-        } elseif(!is_array($tagNames)) {
+        } elseif (!is_array($tagNames)) {
             $tagNames = array(null);
         }
 
@@ -62,7 +62,7 @@ 
     public static function slug($str)
     {
         // Make sure string is in UTF-8 and strip invalid UTF-8 characters
-        $str = mb_convert_encoding((string)$str, 'UTF-8');
+        $str = mb_convert_encoding((string) $str, 'UTF-8');
 
         $options = [
             'delimiter' => config('taggable.delimiter', '-'),
@@ -140,11 +140,11 @@ 
                 'Ă' => 'A', 'ă' => 'a', 'Ș' => 'S', 'ș' => 's', 'Ț' => 'T', 'ț' => 't',
 
                 //Vietnamese
-                'ả' => 'a', 'Ả' => 'A','ạ' => 'a', 'Ạ' => 'A', 'ắ' => 'a', 'Ắ' => 'A', 'ằ' => 'a', 'Ằ' => 'A',
+                'ả' => 'a', 'Ả' => 'A', 'ạ' => 'a', 'Ạ' => 'A', 'ắ' => 'a', 'Ắ' => 'A', 'ằ' => 'a', 'Ằ' => 'A',
                 'ẳ' => 'a', 'Ẳ' => 'A', 'ẵ' => 'a', 'Ẵ' => 'A', 'ặ' => 'a', 'Ặ' => 'A', 'ẩ' => 'a', 'Ẩ' => 'A',
                 'Ấ' => 'A', 'ấ' => 'a', 'Ầ' => 'A', 'ầ' => 'a', 'Ơ' => 'O', 'ơ' => 'o', 'Đ' => 'D', 'đ' => 'd',
                 'ẫ' => 'a', 'Ẫ' => 'A', 'ậ' => 'a', 'Ậ' => 'A', 'ẻ' => 'e', 'Ẻ' => 'E', 'ẽ' => 'e', 'Ẽ' => 'E',
-                'ẹ' => 'e', 'Ẹ' => 'E', 'ế' => 'e', 'Ế' => 'E', 'ề' => 'e', 'Ề' => 'E',  'ể' => 'e', 'Ể' => 'E',
+                'ẹ' => 'e', 'Ẹ' => 'E', 'ế' => 'e', 'Ế' => 'E', 'ề' => 'e', 'Ề' => 'E', 'ể' => 'e', 'Ể' => 'E',
                 'ễ' => 'e', 'Ễ' => 'E', 'ệ' => 'e', 'Ệ' => 'E', 'ỉ' => 'i', 'Ỉ' => 'I', 'ĩ' => 'i', 'Ĩ' => 'I',
                 'ị' => 'i', 'Ị' => 'I', 'ỏ' => 'o', 'Ỏ' => 'O', 'ọ' => 'o', 'Ọ' => 'O', 'ố' => 'o', 'Ố' => 'O',
                 'ồ' => 'o', 'Ồ' => 'O', 'ổ' => 'o', 'Ổ' => 'O', 'ỗ' => 'o', 'Ỗ' => 'O', 'ộ' => 'o', 'Ộ' => 'O',
@@ -173,7 +173,7 @@ 
         $str = preg_replace('/[^\p{L}\p{Nd}]+/u', $options['delimiter'], $str);
 
         // Remove duplicate delimiters
-        $str = preg_replace('/(' . preg_quote($options['delimiter'], '/') . '){2,}/', '$1', $str);
+        $str = preg_replace('/('.preg_quote($options['delimiter'], '/').'){2,}/', '$1', $str);
 
         // Truncate slug to max. characters
         $str = mb_substr($str, 0, ($options['limit'] ? $options['limit'] : mb_strlen($str, 'UTF-8')), 'UTF-8');
@@ -194,12 +194,12 @@ 
      */
     public static function incrementCount($tagString, $tagSlug, $count)
     {
-        if($count <= 0) { return; }
+        if ($count <= 0) { return; }
         $model = static::tagModelString();
 
         $tag = $model::where('slug', '=', $tagSlug)->first();
 
-        if(!$tag) {
+        if (!$tag) {
             $tag = new $model;
             $tag->name = $tagString;
             $tag->slug = $tagSlug;
@@ -219,14 +219,14 @@ 
      */
     public static function decrementCount($tagString, $tagSlug, $count)
     {
-        if($count <= 0) { return; }
+        if ($count <= 0) { return; }
         $model = static::tagModelString();
 
         $tag = $model::where('slug', '=', $tagSlug)->first();
 
-        if($tag) {
+        if ($tag) {
             $tag->count = $tag->count - $count;
-            if($tag->count < 0) {
+            if ($tag->count < 0) {
                 $tag->count = 0;
                 \Log::warning("The '.$model.' count for `$tag->name` was a negative number. This probably means your data got corrupted. Please assess your code and report an issue if you find one.");
             }

src/Model/Tag.php

Spacing +4 added lines, -4 removed lines

@@ -38,7 +38,7 @@ 
      */
     public function save(array $options = [])
     {
-        if(strlen($this->name) < 1) {
+        if (strlen($this->name) < 1) {
             throw new \RuntimeException('Cannot save a tag with an empty name');
         }
 
@@ -64,7 +64,7 @@ 
 
             return $this;
         } else {
-            throw new \RuntimeException('No Tag Group found: '. $groupName);
+            throw new \RuntimeException('No Tag Group found: '.$groupName);
         }
     }
 
@@ -83,7 +83,7 @@ 
 
             return $this;
         } else {
-            throw new \RuntimeException('No Tag Group found: '. $groupName);
+            throw new \RuntimeException('No Tag Group found: '.$groupName);
         }
     }
 
@@ -127,7 +127,7 @@ 
     {
         $groupSlug = TaggingUtility::normalize($groupName);
 
-        return $query->whereHas('group', function (Builder $query) use ($groupSlug) {
+        return $query->whereHas('group', function(Builder $query) use ($groupSlug) {
             $query->where('slug', $groupSlug);
         });
     }

config/tagging.php

Indentation +18 added lines, -18 removed lines

@@ -1,31 +1,31 @@
 <?php
 
 return [
-	// Datatype for primary keys of your models.
-	// used in migrations only
-	'primary_keys_type' => 'integer', // 'string' or 'integer'
+    // Datatype for primary keys of your models.
+    // used in migrations only
+    'primary_keys_type' => 'integer', // 'string' or 'integer'
 		
-	// Value of are passed through this before save of tags
-	'normalizer' => '\Conner\Tagging\Util::slug',
+    // Value of are passed through this before save of tags
+    'normalizer' => '\Conner\Tagging\Util::slug',
 	
-	// Display value of tags are passed through (for front end display)
-	'displayer' => '\Illuminate\Support\Str::title',
+    // Display value of tags are passed through (for front end display)
+    'displayer' => '\Illuminate\Support\Str::title',
 	
-	// Database connection for Conner\Taggable\Tag model to use
+    // Database connection for Conner\Taggable\Tag model to use
 // 	'connection' => 'mysql',
 	
-	// When deleting a model, remove all the tags first
-	'untag_on_delete' => true,
+    // When deleting a model, remove all the tags first
+    'untag_on_delete' => true,
 		
-	// Auto-delete unused tags from the 'tags' database table (when they are used zero times)
-	'delete_unused_tags' => false,
+    // Auto-delete unused tags from the 'tags' database table (when they are used zero times)
+    'delete_unused_tags' => false,
 
-	// Model to use to store the tags in the database
-	'tag_model'=>'\Conner\Tagging\Model\Tag',
+    // Model to use to store the tags in the database
+    'tag_model'=>'\Conner\Tagging\Model\Tag',
 
-	// Delimiter used within tags
-	'delimiter' => '-',
+    // Delimiter used within tags
+    'delimiter' => '-',
 	
-	// Model to use for the relation between tags and tagged records
-	'tagged_model' => '\Conner\Tagging\Model\Tagged',
+    // Model to use for the relation between tags and tagged records
+    'tagged_model' => '\Conner\Tagging\Model\Tagged',
 ];