From 86351cec7fd318b79c1a6c0813e4028b7587431a Mon Sep 17 00:00:00 2001 From: Ben Thomson Date: Mon, 20 Jan 2020 16:14:00 +0800 Subject: [PATCH] Revert "Add Composer scripts" This reverts commit a1cfc2aa58c2fa88c186a4306381fdcf1cd4f269. --- composer.json | 9 ------ config/app.php | 6 ++-- config/cache.php | 2 +- config/cms.php | 10 +++--- config/database.php | 42 ++++++++++++------------- config/mail.php | 12 +++---- config/queue.php | 2 +- config/session.php | 2 +- storage/framework/cache/data/.gitignore | 2 ++ themes/demo/pages/404.htm | 15 +++++---- 10 files changed, 47 insertions(+), 55 deletions(-) create mode 100644 storage/framework/cache/data/.gitignore diff --git a/composer.json b/composer.json index 0f630b0e0..3fa2cbf32 100644 --- a/composer.json +++ b/composer.json @@ -64,15 +64,6 @@ "post-update-cmd": [ "php artisan october:util set build", "php artisan package:discover" - ], - "test": [ - "phpunit --stop-on-failure --prepend ./vendor/october/rain/src/Support/helpers.php" - ], - "lint": [ - "parallel-lint --exclude vendor --exclude storage --exclude tests/fixtures/plugins/testvendor/goto/Plugin.php ." - ], - "sniff": [ - "phpcs --colors -nq --report=\"full\" --extensions=\"php\"" ] }, "config": { diff --git a/config/app.php b/config/app.php index 838123183..e0c727196 100644 --- a/config/app.php +++ b/config/app.php @@ -16,7 +16,7 @@ return [ | */ - 'debug' => env('APP_DEBUG', true), + 'debug' => true, /* |-------------------------------------------------------------------------- @@ -41,7 +41,7 @@ return [ | */ - 'url' => env('APP_URL', 'http://localhost'), + 'url' => 'http://localhost', /* |-------------------------------------------------------------------------- @@ -101,7 +101,7 @@ return [ | */ - 'key' => env('APP_KEY', ''), + 'key' => 'CHANGE_ME!!!!!!!!!!!!!!!!!!!!!!!', 'cipher' => 'AES-256-CBC', diff --git a/config/cache.php b/config/cache.php index ba95b1801..251771724 100644 --- a/config/cache.php +++ b/config/cache.php @@ -13,7 +13,7 @@ return [ | */ - 'default' => env('CACHE_DRIVER', 'file'), + 'default' => 'file', /* |-------------------------------------------------------------------------- diff --git a/config/cms.php b/config/cms.php index b5b5eb135..4c838a026 100644 --- a/config/cms.php +++ b/config/cms.php @@ -156,7 +156,7 @@ return [ | */ - 'enableRoutesCache' => env('ROUTES_CACHE', false), + 'enableRoutesCache' => false, /* |-------------------------------------------------------------------------- @@ -196,7 +196,7 @@ return [ | */ - 'enableAssetCache' => env('ASSET_CACHE', false), + 'enableAssetCache' => false, /* |-------------------------------------------------------------------------- @@ -250,7 +250,7 @@ return [ | */ - 'databaseTemplates' => env('DATABASE_TEMPLATES', false), + 'databaseTemplates' => false, /* |-------------------------------------------------------------------------- @@ -343,7 +343,7 @@ return [ | */ - 'linkPolicy' => env('LINK_POLICY', 'detect'), + 'linkPolicy' => 'detect', /* |-------------------------------------------------------------------------- @@ -379,7 +379,7 @@ return [ | */ - 'enableCsrfProtection' => env('ENABLE_CSRF', true), + 'enableCsrfProtection' => true, /* |-------------------------------------------------------------------------- diff --git a/config/database.php b/config/database.php index 8087772e9..70f1420c6 100644 --- a/config/database.php +++ b/config/database.php @@ -26,7 +26,7 @@ return [ | */ - 'default' => env('DB_CONNECTION', 'mysql'), + 'default' => 'mysql', /* |-------------------------------------------------------------------------- @@ -48,18 +48,18 @@ return [ 'sqlite' => [ 'driver' => 'sqlite', - 'database' => env('DB_DATABASE', 'storage/database.sqlite'), + 'database' => 'storage/database.sqlite', 'prefix' => '', ], 'mysql' => [ 'driver' => 'mysql', 'engine' => 'InnoDB', - 'host' => env('DB_HOST', 'localhost'), - 'port' => env('DB_PORT', 3306), - 'database' => env('DB_DATABASE', 'database'), - 'username' => env('DB_USERNAME', ''), - 'password' => env('DB_PASSWORD', ''), + 'host' => 'localhost', + 'port' => 3306, + 'database' => 'database', + 'username' => 'root', + 'password' => '', 'charset' => 'utf8mb4', 'collation' => 'utf8mb4_unicode_ci', 'prefix' => '', @@ -68,11 +68,11 @@ return [ 'pgsql' => [ 'driver' => 'pgsql', - 'host' => env('DB_HOST', 'localhost'), - 'port' => env('DB_PORT', 5432), - 'database' => env('DB_DATABASE', 'database'), - 'username' => env('DB_USERNAME', ''), - 'password' => env('DB_PASSWORD', ''), + 'host' => 'localhost', + 'port' => 5432, + 'database' => 'database', + 'username' => 'root', + 'password' => '', 'charset' => 'utf8', 'prefix' => '', 'schema' => 'public', @@ -80,11 +80,11 @@ return [ 'sqlsrv' => [ 'driver' => 'sqlsrv', - 'host' => env('DB_HOST', 'localhost'), - 'port' => env('DB_PORT', 5432), - 'database' => env('DB_DATABASE', 'database'), - 'username' => env('DB_USERNAME', ''), - 'password' => env('DB_PASSWORD', ''), + 'host' => 'localhost', + 'port' => 1433, + 'database' => 'database', + 'username' => 'root', + 'password' => '', 'prefix' => '', ], @@ -119,9 +119,9 @@ return [ 'cluster' => false, 'default' => [ - 'host' => env('REDIS_HOST', '127.0.0.1'), - 'password' => env('REDIS_PASSWORD', ''), - 'port' => env('REDIS_PORT', 6379), + 'host' => '127.0.0.1', + 'password' => null, + 'port' => 6379, 'database' => 0, ], @@ -142,5 +142,5 @@ return [ | */ - 'useConfigForTesting' => env('DB_USE_CONFIG_FOR_TESTING', false), + 'useConfigForTesting' => false, ]; diff --git a/config/mail.php b/config/mail.php index 2823eac3a..7c2332d2f 100644 --- a/config/mail.php +++ b/config/mail.php @@ -16,7 +16,7 @@ return [ | */ - 'driver' => env('MAIL_DRIVER', 'smtp'), + 'driver' => 'smtp', /* |-------------------------------------------------------------------------- @@ -29,7 +29,7 @@ return [ | */ - 'host' => env('MAIL_HOST', 'smtp.mailgun.org'), + 'host' => 'smtp.mailgun.org', /* |-------------------------------------------------------------------------- @@ -42,7 +42,7 @@ return [ | */ - 'port' => env('MAIL_PORT', 587), + 'port' => 587, /* |-------------------------------------------------------------------------- @@ -68,7 +68,7 @@ return [ | */ - 'encryption' => env('MAIL_ENCRYPTION', 'tls'), + 'encryption' => 'tls', /* |-------------------------------------------------------------------------- @@ -81,7 +81,7 @@ return [ | */ - 'username' => env('MAIL_USERNAME', ''), + 'username' => null, /* |-------------------------------------------------------------------------- @@ -94,7 +94,7 @@ return [ | */ - 'password' => env('MAIL_PASSWORD', ''), + 'password' => null, /* |-------------------------------------------------------------------------- diff --git a/config/queue.php b/config/queue.php index e14dfac78..de27ab7f1 100644 --- a/config/queue.php +++ b/config/queue.php @@ -16,7 +16,7 @@ return [ | */ - 'default' => env('QUEUE_CONNECTION', 'sync'), + 'default' => 'sync', /* |-------------------------------------------------------------------------- diff --git a/config/session.php b/config/session.php index 194747a76..ab762f221 100644 --- a/config/session.php +++ b/config/session.php @@ -16,7 +16,7 @@ return [ | */ - 'driver' => env('SESSION_DRIVER', 'file'), + 'driver' => 'file', /* |-------------------------------------------------------------------------- diff --git a/storage/framework/cache/data/.gitignore b/storage/framework/cache/data/.gitignore new file mode 100644 index 000000000..c96a04f00 --- /dev/null +++ b/storage/framework/cache/data/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore \ No newline at end of file diff --git a/themes/demo/pages/404.htm b/themes/demo/pages/404.htm index 56246825d..984fb0e77 100644 --- a/themes/demo/pages/404.htm +++ b/themes/demo/pages/404.htm @@ -1,11 +1,10 @@ title = "Page not found (404)" -url = "/404/:slug" +url = "/404" layout = "default" -is_hidden = 0 == -<div class="jumbotron"> - <div class="container"> - <h1>Page not found</h1> - <p>We're sorry, but the page you requested cannot be found.</p> - </div> -</div> \ No newline at end of file +
+
+

Page not found

+

We're sorry, but the page you requested cannot be found.

+
+
\ No newline at end of file