lovecoding-git · voxsar · Sep 29, 2021 · Sep 30, 2021 · Sep 30, 2021 · Oct 1, 2021
diff --git a/.babelrc b/.babelrc
@@ -1,10 +1,17 @@
 {
   "plugins": [
-    "@babel/plugin-proposal-class-properties",
-    ["prismjs", {
-      "languages": ["php"],
-      "plugins": ["line-numbers", "line-highlight"],
-      "css": true
-    }]
+    [
+      "prismjs",
+      {
+        "languages": [
+          "php"
+        ],
+        "plugins": [
+          "line-numbers",
+          "line-highlight"
+        ],
+        "css": true
+      }
+    ]
   ]
 }
diff --git a/.env.example b/.env.example
@@ -3,6 +3,8 @@ APP_KEY=
 APP_DEBUG=true
 APP_LOG_LEVEL=debug
 APP_URL=http://localhost
+MINIMAL_FRONTEND=false
+SHOULD_EMAIL_EXCEPTIONS=true
 
 CASHIER_MODEL=App\Models\User
 
@@ -39,7 +41,7 @@ REDIS_HOST=127.0.0.1
 REDIS_PASSWORD=null
 REDIS_PORT=6379
 
-MAIL_DRIVER=smtp
+MAIL_MAILER=smtp
 MAIL_HOST=mailtrap.io
 MAIL_PORT=2525
 MAIL_USERNAME=null
@@ -58,4 +60,8 @@ GITHUB_CALLBACK=${APP_URL}/login/github/callback
 STRIPE_KEY=your-stripe-key
 STRIPE_SECRET=your-stripe-secret
 STRIPE_STARTER_ID=
-STRIPE_UNLIMITED_ID=
+STRIPE_UNLIMITED_ID=
+
+AUTH_REGISTER_ENABLED=true
+
+HORIZON_TOKEN=
diff --git a/.gitattributes b/.gitattributes
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
diff --git a/.github/workflows/php_test.yml b/.github/workflows/php_test.yml
@@ -0,0 +1,45 @@
+name: PHP Composer
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        php: ['8.2']
+
+    name: PHP ${{ matrix.php }} 
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+
+      - name: Validate composer.json and composer.lock
+        run: composer validate --no-check-all --strict
+
+      - name: Copy .env
+        run: php -r "file_exists('.env') || copy('.env.example', '.env');"
+
+      - name: Install dependencies
+        run: composer install --prefer-dist --no-progress
+
+      - name: Generate key
+        run: php artisan key:generate
+
+      - name: Run npm install
+        run: npm install
+
+      - name: Run npm run prod
+        run: npm run prod
+
+      - name: Run test suite
+        run: ./vendor/bin/pest
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,4 @@
 /node_modules
-/public/storage
 /vendor
 /.idea
 Homestead.json
@@ -12,8 +11,16 @@ _ide_helper.php
 .phpstorm.meta.php
 .php_cs.cache
 public/sitemap.xml
-<<<<<<< HEAD
-.php_cs.cache
-=======
-/public/js/resources*.js
->>>>>>> b5617108e7b7382948c366d400d81f1d6174b096
+/public/storage
+.phpunit.result.cache
+phpunit.xml
+.php-cs-fixer.cache
+
+# Ignore compiled frontend code
+/public/css/*.css
+/public/js/*.js
+/public/mix-manifest.json
+rr
+.rr.yaml
+
+/docker/db-data
diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php
@@ -0,0 +1,162 @@
+<?php
+
+// updated at 2022/07/02 july-2th version.
+// https://gist.github.com/laravel-shift/cab527923ed2a109dda047b97d53c200
+
+$rules = [
+    'array_indentation' => true,
+    'array_syntax' => ['syntax' => 'short'],
+    'binary_operator_spaces' => [
+        'default' => 'single_space',
+        'operators' => ['=>' => null],
+    ],
+    'blank_line_after_namespace' => true,
+    'blank_line_after_opening_tag' => true,
+    'blank_line_before_statement' => [
+        'statements' => ['return'],
+    ],
+    'braces' => true,
+    'cast_spaces' => true,
+    'class_attributes_separation' => [
+        'elements' => [
+            'const' => 'one',
+            'method' => 'one',
+            'property' => 'one',
+            'trait_import' => 'none',
+        ],
+    ],
+    'class_definition' => [
+        'multi_line_extends_each_single_line' => true,
+        'single_item_single_line' => true,
+        'single_line' => true,
+    ],
+    'concat_space' => [
+        'spacing' => 'none',
+    ],
+    'constant_case' => ['case' => 'lower'],
+    'declare_equal_normalize' => true,
+    'elseif' => true,
+    'encoding' => true,
+    'full_opening_tag' => true,
+    'fully_qualified_strict_types' => true, // added by Shift
+    'function_declaration' => true,
+    'function_typehint_space' => true,
+    'general_phpdoc_tag_rename' => true,
+    'heredoc_to_nowdoc' => true,
+    'include' => true,
+    'increment_style' => ['style' => 'post'],
+    'indentation_type' => true,
+    'linebreak_after_opening_tag' => true,
+    'line_ending' => true,
+    'lowercase_cast' => true,
+    'lowercase_keywords' => true,
+    'lowercase_static_reference' => true, // added from Symfony
+    'magic_method_casing' => true, // added from Symfony
+    'magic_constant_casing' => true,
+    'method_argument_space' => [
+        'on_multiline' => 'ignore',
+    ],
+    'multiline_whitespace_before_semicolons' => [
+        'strategy' => 'no_multi_line',
+    ],
+    'native_function_casing' => true,
+    'no_alias_functions' => true,
+    'no_extra_blank_lines' => [
+        'tokens' => [
+            'extra',
+            'throw',
+            'use',
+        ],
+    ],
+    'no_blank_lines_after_class_opening' => true,
+    'no_blank_lines_after_phpdoc' => true,
+    'no_closing_tag' => true,
+    'no_empty_phpdoc' => true,
+    'no_empty_statement' => true,
+    'no_leading_import_slash' => true,
+    'no_leading_namespace_whitespace' => true,
+    'no_mixed_echo_print' => [
+        'use' => 'echo',
+    ],
+    'no_multiline_whitespace_around_double_arrow' => true,
+    'no_short_bool_cast' => true,
+    'no_singleline_whitespace_before_semicolons' => true,
+    'no_spaces_after_function_name' => true,
+    'no_spaces_around_offset' => [
+        'positions' => ['inside', 'outside'],
+    ],
+    'no_spaces_inside_parenthesis' => true,
+    'no_trailing_comma_in_list_call' => true,
+    'no_trailing_comma_in_singleline_array' => true,
+    'no_trailing_whitespace' => true,
+    'no_trailing_whitespace_in_comment' => true,
+    'no_unneeded_control_parentheses' => [
+        'statements' => ['break', 'clone', 'continue', 'echo_print', 'return', 'switch_case', 'yield'],
+    ],
+    'no_unreachable_default_argument_value' => true,
+    'no_useless_return' => true,
+    'no_whitespace_before_comma_in_array' => true,
+    'no_whitespace_in_blank_line' => true,
+    'normalize_index_brace' => true,
+    'not_operator_with_successor_space' => true,
+    'object_operator_without_whitespace' => true,
+    'ordered_imports' => ['sort_algorithm' => 'alpha'],
+    'psr_autoloading' => true,
+    'phpdoc_indent' => true,
+    'phpdoc_inline_tag_normalizer' => true,
+    'phpdoc_no_access' => true,
+    'phpdoc_no_package' => true,
+    'phpdoc_no_useless_inheritdoc' => true,
+    'phpdoc_scalar' => true,
+    'phpdoc_single_line_var_spacing' => true,
+    'phpdoc_summary' => false,
+    'phpdoc_to_comment' => false, // override to preserve user preference
+    'phpdoc_tag_type' => true,
+    'phpdoc_trim' => true,
+    'phpdoc_types' => true,
+    'phpdoc_var_without_name' => true,
+    'self_accessor' => true,
+    'short_scalar_cast' => true,
+    'simplified_null_return' => false, // disabled as "risky"
+    'single_blank_line_at_eof' => true,
+    'single_blank_line_before_namespace' => true,
+    'single_class_element_per_statement' => [
+        'elements' => ['const', 'property'],
+    ],
+    'single_import_per_statement' => true,
+    'single_line_after_imports' => true,
+    'single_line_comment_style' => [
+        'comment_types' => ['hash'],
+    ],
+    'single_quote' => true,
+    'space_after_semicolon' => true,
+    'standardize_not_equals' => true,
+    'switch_case_semicolon_to_colon' => true,
+    'switch_case_space' => true,
+    'ternary_operator_spaces' => true,
+    'trailing_comma_in_multiline' => ['elements' => ['arrays']],
+    'trim_array_spaces' => true,
+    'unary_operator_spaces' => true,
+    'visibility_required' => [
+        'elements' => ['method', 'property'],
+    ],
+    'whitespace_after_comma_in_array' => true,
+    'no_unused_imports' => true,
+];
+
+
+$finder = Symfony\Component\Finder\Finder::create()
+    ->notPath('vendor')
+    ->notPath('bootstrap')
+    ->notPath('storage')
+    ->notPath('nova')
+    ->in(__DIR__)
+    ->name('*.php')
+    ->ignoreVCS(true)
+    ->ignoreDotFiles(true)
+    ->notName('*.blade.php');
+
+return (new PhpCsFixer\Config)
+    ->setRiskyAllowed(true)
+    ->setRules($rules)
+    ->setFinder($finder);
diff --git a/.php_cs b/.php_cs
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/LICENSE.md b/LICENSE.md
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@ This repository contains the actual code on https://www.larabug.com
 
 ## Requirements
 
-* PHP >= 7.3
+* PHP 8.2 or higher
 * Git
 * Composer
 * MySQL (>=5.7) or PostgreSQL (>=9.4)
@@ -29,16 +29,39 @@ Configure your database in the `.env` file and then run:
 php artisan migrate
 ```
 
+###Docker
+
+### Getting up and running...
+
+Go into the docker folder and run:
+`docker-compose up -d --build`
+
+Set your database .env variables:
+```
+DB_CONNECTION=mysql
+DB_HOST=db
+DB_PORT=3306
+DB_DATABASE=larbug
+DB_USERNAME=root
+DB_PASSWORD=secret
+```
+
+Running artisan commands:
+
+`docker exec -it larabug php artisan <command>`
+
+The Application will be running on `localhost:1337` and PhpMyAdmin is running on `localhost:8010`
+
 ## Important to know
 
 This project is created by me [back in 2016](https://laraveldaily.com/dennis-larabug-growing-faster-imagine/), it is very old, and the code doesn't even look remotely to what I code now. The point here
-is that there are no tests, and some stuff might look cumbersome. You're more than welcome to clean code
+is that there are no tests, and some stuff might look cumbersome, however the code works beautifully and like intented. You're more than welcome to clean code
 and generalize stuff better.
 
 ## Testing
 
 ```bash
-composer test
+./vendor/bin/pest
 ```
 
 ## Changelog

diff --git a/app/Console/Commands/CheckExpiredPlans.php b/app/Console/Commands/CheckExpiredPlans.php
diff --git a/app/Console/Commands/CheckExpiredTrials.php b/app/Console/Commands/CheckExpiredTrials.php
diff --git a/app/Console/Commands/GenerateSitemap.php b/app/Console/Commands/GenerateSitemap.php
diff --git a/app/Console/Commands/MailExceptions.php b/app/Console/Commands/MailExceptions.php
@@ -16,9 +16,10 @@ class MailExceptions extends Command
 
     public function handle()
     {
-        $users = User::where('receive_email', true)
+        $users = User::query()->where('receive_email', true)
             ->whereHas('projects', function ($query) {
                 return $query
+                    ->where('notifications_enabled', true)
                     ->where('receive_email', true)
                     ->whereHas('exceptions', function ($query) {
                         return $query->where('mailed', false);
@@ -27,6 +28,7 @@ public function handle()
             ->with(['projects' => function ($query) {
                 return $query
                     ->select('id', 'title')
+                    ->where('notifications_enabled', true)
                     ->where('receive_email', true)
                     ->whereHas('exceptions', function ($query) {
                         return $query->where('mailed', false);