zgabievi / laravel-promocodes

src/migrations/2016_05_17_221000_create_promocodes_table.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
      */
     public function up()
     {
-        Schema::create(config('promocodes.table', 'promocodes'), function (Blueprint $table) {
+        Schema::create(config('promocodes.table', 'promocodes'), function(Blueprint $table) {
             $table->increments('id');
 
             $table->integer('user_id')->unsigned()->nullable();

src/PromocodesServiceProvider.php

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
             __DIR__.'/config/promocodes.php', 'promocodes'
         );
 
-        $this->app->singleton('promocodes', function ($app) {
+        $this->app->singleton('promocodes', function($app) {
             return new Promocodes();
         });
     }

src/Traits/Rewardable.php

Doc Comments +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
      * @param null  $reward
      * @param array $data
      *
-     * @return mixed
+     * @return \Illuminate\Support\Collection
      */
     public function createCode($amount = 1, $reward = null, array $data = [])
     {

src/Promocodes.php

Spacing +3 added lines, -3 removed lines

@@ -139,14 +139,14 @@
      * @return static
      */
     public function create($amount = 1, $reward = null, array $data = [])
-=======
+=== === =
      * @param int  $amount
      * @param null $reward
      *
      * @return static
-     */
+     * /
     public function create($amount = 1, $reward = null)
->>>>>>> 46cd444ffd48ecc5f447fb653487856224e958d6
+>> >> >> > 46cd444ffd48ecc5f447fb653487856224e958d6
     {
         $records = [];