Merge pull request #6 from euantorano/fix-5-use-eloquent-repositories

Using Eloquent for #5.
mybb · Jun 14, 2015 · 79328c9 · 79328c9
2 parents d64364a + 4c22835
commit 79328c9
Show file tree

Hide file tree

Showing 32 changed files with 1,032 additions and 604 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/resources/migrations/2015_02_16_164601_create_parser_badwords_table.php b/resources/migrations/2015_02_16_164601_create_parser_badwords_table.php
@@ -21,7 +21,7 @@ class CreateParserBadwordsTable extends Migration
 	public function up()
 	{
 		Schema::create('parser_badwords', function (Blueprint $table) {
-			$table->increments('bid');
+			$table->increments('id');
 			$table->string('find', 100);
 			$table->string('replace', 100)->nullable();
 		});

diff --git a/resources/migrations/2015_02_16_164601_create_parser_mycode_table.php b/resources/migrations/2015_02_16_164601_create_parser_mycode_table.php
@@ -21,7 +21,7 @@ class CreateParserMycodeTable extends Migration
 	public function up()
 	{
 		Schema::create('parser_mycode', function (Blueprint $table) {
-			$table->increments('cid');
+			$table->increments('id');
 			$table->text('regex');
 			$table->text('replacement');
 			$table->smallInteger('parseorder', false, true);

diff --git a/resources/migrations/2015_02_16_164601_create_parser_smilies_table.php b/resources/migrations/2015_02_16_164601_create_parser_smilies_table.php
@@ -21,8 +21,8 @@ class CreateParserSmiliesTable extends Migration
 	public function up()
 	{
 		Schema::create('parser_smilies', function (Blueprint $table) {
-			$table->increments('sid');
-			$table->text('find');
+			$table->increments('id');
+			$table->text('find')->unique();
 			$table->string('image');
 			$table->smallInteger('disporder', false, true);
 		});

diff --git a/src/Badwords/BadwordRepository.php b/src/Badwords/BadwordRepository.php
diff --git a/src/Badwords/BadwordRepositoryInterface.php b/src/Badwords/BadwordRepositoryInterface.php
diff --git a/src/Badwords/CachingDecorator.php b/src/Badwords/CachingDecorator.php