Reformat the project

Author: akalongman

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "php-telegram-bot/laravel",
     "type": "library",
-    "description": "Package to integrate PHP Telegram Bot library in Laravel 5.x",
+    "description": "Package to integrate PHP Telegram Bot library in Laravel 6.x",
     "keywords": [
         "laravel",
         "telegram",
@@ -22,9 +22,9 @@
         }
     ],
     "require": {
-        "php": ">=5.5.9",
-        "illuminate/database": "5.*|6.*",
-        "illuminate/support": "5.*|6.*",
+        "php": "^7.2",
+        "illuminate/database": "^6.0",
+        "illuminate/support": "^6.0",
         "longman/telegram-bot": "^0.60"
     },
     "require-dev": {

phpcs.xml

@@ -10,4 +10,9 @@
         <exclude-pattern>tests/*</exclude-pattern>
     </rule>
 
+    <!-- Temp fix -->
+    <rule ref="PSR12.Files.FileHeader">
+        <exclude name="PSR12.Files.FileHeader.IncorrectOrder"/>
+    </rule>
+
 </ruleset>

src/Laravel/PhpTelegramBot.php

@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 /*
  * This file is part of the PhpTelegramBot/Laravel package.
  *
@@ -7,12 +10,11 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-
 namespace PhpTelegramBot\Laravel;
 
 use Longman\TelegramBot\Telegram;
 
 class PhpTelegramBot extends Telegram implements PhpTelegramBotContract
 {
-
+    //
 }

src/Laravel/PhpTelegramBotContract.php

@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 /*
  * This file is part of the PhpTelegramBot/Laravel package.
  *
@@ -7,13 +10,12 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-
 namespace PhpTelegramBot\Laravel;
 
 /**
  * @mixin \Longman\TelegramBot\Telegram
  */
 interface PhpTelegramBotContract
 {
-
+    //
 }

src/Laravel/PhpTelegramBotServiceProvider.php

@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 /*
  * This file is part of the PhpTelegramBot/Laravel package.
  *
@@ -7,7 +10,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-
 namespace PhpTelegramBot\Laravel;
 
 use Illuminate\Contracts\Foundation\Application;
@@ -41,7 +43,7 @@ public function boot()
         );
 
         $this->publishes([
-            __DIR__ . '/../database/migrations/' => database_path('migrations')
+            __DIR__ . '/../database/migrations/' => database_path('migrations'),
         ], 'migrations');
     }
 
@@ -52,7 +54,7 @@ public function boot()
      */
     public function register()
     {
-        $this->app->bind(PhpTelegramBotContract::class, function (Application $app) {
+        $this->app->bind(PhpTelegramBotContract::class, static function (Application $app) {
             $config = $app['config']->get('phptelegrambot');
 
             $bot = new PhpTelegramBot($config['bot']['api_key'], ! empty($config['bot']['name']) ? $config['bot']['name'] : '');

src/config/config.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 return [
     /**
      * Bot configuration

src/database/migrations/2018_04_18_193554_create_botan_shortener_table.php

@@ -1,19 +1,15 @@
 <?php
 
+declare(strict_types=1);
+
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
 class CreateBotanShortenerTable extends Migration
 {
-
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
     public function up()
     {
-        Schema::create('botan_shortener', function (Blueprint $table) {
+        Schema::create('botan_shortener', static function (Blueprint $table) {
             $table->bigInteger('id', true)->unsigned()->comment('Unique identifier for this entry');
             $table->bigInteger('user_id')->nullable()->index('user_id')->comment('Unique user identifier');
             $table->text('url', 65535)->comment('Original URL');
@@ -22,14 +18,8 @@ public function up()
         });
     }
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
     public function down()
     {
         Schema::drop('botan_shortener');
     }
-
 }

src/database/migrations/2018_04_18_193554_create_callback_query_table.php

@@ -1,19 +1,15 @@
 <?php
 
+declare(strict_types=1);
+
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
 class CreateCallbackQueryTable extends Migration
 {
-
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
     public function up()
     {
-        Schema::create('callback_query', function (Blueprint $table) {
+        Schema::create('callback_query', static function (Blueprint $table) {
             $table->bigInteger('id')->unsigned()->primary()->comment('Unique identifier for this query');
             $table->bigInteger('user_id')->nullable()->index('user_id')->comment('Unique user identifier');
             $table->bigInteger('chat_id')->nullable()->index('chat_id')->comment('Unique chat identifier');
@@ -25,14 +21,8 @@ public function up()
         });
     }
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
     public function down()
     {
         Schema::drop('callback_query');
     }
-
 }

src/database/migrations/2018_04_18_193554_create_chat_table.php

@@ -1,19 +1,15 @@
 <?php
 
+declare(strict_types=1);
+
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
 class CreateChatTable extends Migration
 {
-
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
     public function up()
     {
-        Schema::create('chat', function (Blueprint $table) {
+        Schema::create('chat', static function (Blueprint $table) {
             $table->bigInteger('id')->primary()->comment('Unique user or chat identifier');
             $table->enum('type', ['private', 'group', 'supergroup', 'channel'])->comment('Chat type, either private, group, supergroup or channel');
             $table->char('title')->nullable()->default('')->comment('Chat (group) title, is null if chat type is private');
@@ -24,14 +20,8 @@ public function up()
         });
     }
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
     public function down()
     {
         Schema::drop('chat');
     }
-
 }

src/database/migrations/2018_04_18_193554_create_chosen_inline_result_table.php

@@ -1,19 +1,15 @@
 <?php
 
+declare(strict_types=1);
+
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
 class CreateChosenInlineResultTable extends Migration
 {
-
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
     public function up()
     {
-        Schema::create('chosen_inline_result', function (Blueprint $table) {
+        Schema::create('chosen_inline_result', static function (Blueprint $table) {
             $table->bigInteger('id', true)->unsigned()->comment('Unique identifier for this entry');
             $table->char('result_id')->default('')->comment('Identifier for this result');
             $table->bigInteger('user_id')->nullable()->index('user_id')->comment('Unique user identifier');
@@ -24,14 +20,8 @@ public function up()
         });
     }
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
     public function down()
     {
         Schema::drop('chosen_inline_result');
     }
-
 }

src/database/migrations/2018_04_18_193554_create_conversation_table.php

@@ -1,19 +1,15 @@
 <?php
 
+declare(strict_types=1);
+
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
 class CreateConversationTable extends Migration
 {
-
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
     public function up()
     {
-        Schema::create('conversation', function (Blueprint $table) {
+        Schema::create('conversation', static function (Blueprint $table) {
             $table->bigInteger('id', true)->unsigned()->comment('Unique identifier for this entry');
             $table->bigInteger('user_id')->nullable()->index('user_id')->comment('Unique user identifier');
             $table->bigInteger('chat_id')->nullable()->index('chat_id')->comment('Unique user or chat identifier');
@@ -24,14 +20,8 @@ public function up()
         });
     }
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
     public function down()
     {
         Schema::drop('conversation');
     }
-
 }

src/database/migrations/2018_04_18_193554_create_edited_message_table.php

@@ -1,19 +1,15 @@
 <?php
 
+declare(strict_types=1);
+
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
 class CreateEditedMessageTable extends Migration
 {
-
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
     public function up()
     {
-        Schema::create('edited_message', function (Blueprint $table) {
+        Schema::create('edited_message', static function (Blueprint $table) {
             $table->bigInteger('id', true)->unsigned()->comment('Unique identifier for this entry');
             $table->bigInteger('chat_id')->nullable()->index('chat_id')->comment('Unique chat identifier');
             $table->bigInteger('message_id')->unsigned()->nullable()->index('message_id')->comment('Unique message identifier');
@@ -29,14 +25,8 @@ public function up()
         });
     }
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
     public function down()
     {
         Schema::drop('edited_message');
     }
-
 }

src/database/migrations/2018_04_18_193554_create_inline_query_table.php

@@ -1,19 +1,15 @@
 <?php
 
+declare(strict_types=1);
+
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 
 class CreateInlineQueryTable extends Migration
 {
-
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
     public function up()
     {
-        Schema::create('inline_query', function (Blueprint $table) {
+        Schema::create('inline_query', static function (Blueprint $table) {
             $table->bigInteger('id')->unsigned()->primary()->comment('Unique identifier for this query');
             $table->bigInteger('user_id')->nullable()->index('user_id')->comment('Unique user identifier');
             $table->char('location')->nullable()->comment('Location of the user');
@@ -23,14 +19,8 @@ public function up()
         });
     }
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
     public function down()
     {
         Schema::drop('inline_query');
     }
-
 }