Merge branch 'main' of github.com:codebar-ag/laravel-prerender

Author: ruslansteiger

.github/workflows/php-cs-fixer.yml

@@ -11,9 +11,9 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Fix style
-        uses: docker://oskarstark/php-cs-fixer-ga:2.18.6
+        uses: docker://oskarstark/php-cs-fixer-ga:3.0.0
         with:
-          args: --config=.php_cs --allow-risky=yes
+          args: --config=.php-cs-fixer.dist.php --allow-risky=yes
 
       - name: Extract branch name
         shell: bash

.gitignore

@@ -7,4 +7,5 @@ coverage
 docs
 vendor
 .php_cs.cache
+.php-cs-fixer.cache
 coverage.xml

.php_cs .php-cs-fixer.dist.php.php_cs renamed to .php-cs-fixer.dist.php

@@ -6,17 +6,18 @@
         __DIR__ . '/tests',
     ])
     ->name('*.php')
+    ->notName('*.blade.php')
     ->ignoreDotFiles(true)
     ->ignoreVCS(true);
 
-return PhpCsFixer\Config::create()
+return (new PhpCsFixer\Config())
     ->setRules([
         '@PSR2' => true,
         'array_syntax' => ['syntax' => 'short'],
-        'ordered_imports' => ['sortAlgorithm' => 'alpha'],
+        'ordered_imports' => ['sort_algorithm' => 'alpha'],
         'no_unused_imports' => true,
         'not_operator_with_successor_space' => false,
-        'trailing_comma_in_multiline_array' => true,
+        'trailing_comma_in_multiline' => true,
         'phpdoc_scalar' => true,
         'unary_operator_spaces' => true,
         'binary_operator_spaces' => true,
@@ -28,6 +29,8 @@
         'method_argument_space' => [
             'on_multiline' => 'ensure_fully_multiline',
             'keep_multiple_spaces_after_comma' => true,
-        ]
+        ],
+        'single_trait_insert_per_statement' => true,
+        'single_quote' => true,
     ])
     ->setFinder($finder);

composer.json

@@ -34,7 +34,7 @@
         "symfony/psr-http-message-bridge": "^1.3|^2.0"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "2.18.6",
+        "friendsofphp/php-cs-fixer": "3.0.0",
         "orchestra/testbench": "^4.0|^5.0|^6.0",
         "phpunit/phpunit": "^8.4|^9.0"
     },
@@ -51,7 +51,7 @@
     "scripts": {
         "test": "vendor/bin/phpunit",
         "test-coverage": "vendor/bin/phpunit --coverage-html coverage",
-        "format": "vendor/bin/php-cs-fixer fix --allow-risky=yes --config=.php_cs"
+        "format": "vendor/bin/php-cs-fixer fix --allow-risky=yes --config=.php-cs-fixer.dist.php"
     },
     "config": {
         "sort-packages": true

tests/PrerenderMiddlewareTest.php

@@ -31,6 +31,14 @@ public function it_should_prerender_page_with_escaped_fragment_in_query_string()
             ->assertSuccessful();
     }
 
+    /** @test */
+    public function it_should_prerender_when_user_agent_is_part_of_crawler_user_agents()
+    {
+        $this->get('/test-middleware', ['User-Agent' => 'Googlebot/2.1 (+http://www.google.com/bot.html)',])
+            ->assertHeader('prerender.io-mock', true)
+            ->assertSuccessful();
+    }
+
     /** @test */
     public function it_should_prerender_page_with_url_in_whitelist()
     {