Agent Software (#1)

Author: evan-burrell

CHANGELOG.md

@@ -4,11 +4,11 @@ All notable changes to `laravel-prerender` will be documented in this file.
 
 ## 3.1.1 - 2021-05-21
 
-- Fix bug causing the middleware to never work https://github.com/codebar-ag/laravel-prerender/pull/25
+- Fix bug causing the middleware to never work https://github.com/agentsoftware/laravel-prerender/pull/25
 
 ## 3.1.0 - 2021-04-28
 
-- Added additional [user agents](https://github.com/codebar-ag/laravel-prerender/commit/a8706a678b2f990cd1f108866c7d2b10f4b4e658)
+- Added additional [user agents](https://github.com/agentsoftware/laravel-prerender/commit/a8706a678b2f990cd1f108866c7d2b10f4b4e658)
 - Refactored
 - Moved the default branch to `main`
 

README.md

@@ -1,11 +1,11 @@
-<img src="https://banners.beyondco.de/Laravel%20Prerender.png?theme=light&packageManager=composer+require&packageName=codebar-ag%2Flaravel-prerender&pattern=circuitBoard&style=style_2&description=Integrate+Prerender.io+with+Laravel&md=1&showWatermark=0&fontSize=175px&images=template&widths=500&heights=500">
+<img src="https://banners.beyondco.de/Laravel%20Prerender.png?theme=light&packageManager=composer+require&packageName=agentsoftware%2Flaravel-prerender&pattern=circuitBoard&style=style_2&description=Integrate+Prerender.io+with+Laravel&md=1&showWatermark=0&fontSize=175px&images=template&widths=500&heights=500">
 
-[![Latest Version on Packagist](https://img.shields.io/packagist/v/codebar-ag/laravel-prerender.svg?style=flat-square)](https://packagist.org/packages/codebar-ag/laravel-prerender)
-[![Total Downloads](https://img.shields.io/packagist/dt/codebar-ag/laravel-prerender.svg?style=flat-square)](https://packagist.org/packages/codebar-ag/laravel-prerender)
-[![GitHub-Tests](https://github.com/codebar-ag/laravel-prerender/actions/workflows/run-tests.yml/badge.svg?branch=main)](https://github.com/codebar-ag/laravel-prerender/actions/workflows/run-tests.yml)
-[![GitHub Code Style](https://github.com/codebar-ag/laravel-prerender/actions/workflows/fix-php-code-style-issues.yml/badge.svg?branch=main)](https://github.com/codebar-ag/laravel-prerender/actions/workflows/fix-php-code-style-issues.yml)
-[![PHPStan](https://github.com/codebar-ag/laravel-prerender/actions/workflows/phpstan.yml/badge.svg)](https://github.com/codebar-ag/laravel-prerender/actions/workflows/phpstan.yml)
-[![Dependency Review](https://github.com/codebar-ag/laravel-prerender/actions/workflows/dependency-review.yml/badge.svg)](https://github.com/codebar-ag/laravel-prerender/actions/workflows/dependency-review.yml)
+[![Latest Version on Packagist](https://img.shields.io/packagist/v/agentsoftware/laravel-prerender.svg?style=flat-square)](https://packagist.org/packages/agentsoftware/laravel-prerender)
+[![Total Downloads](https://img.shields.io/packagist/dt/agentsoftware/laravel-prerender.svg?style=flat-square)](https://packagist.org/packages/agentsoftware/laravel-prerender)
+[![GitHub-Tests](https://github.com/agentsoftware/laravel-prerender/actions/workflows/run-tests.yml/badge.svg?branch=main)](https://github.com/agentsoftware/laravel-prerender/actions/workflows/run-tests.yml)
+[![GitHub Code Style](https://github.com/agentsoftware/laravel-prerender/actions/workflows/fix-php-code-style-issues.yml/badge.svg?branch=main)](https://github.com/agentsoftware/laravel-prerender/actions/workflows/fix-php-code-style-issues.yml)
+[![PHPStan](https://github.com/agentsoftware/laravel-prerender/actions/workflows/phpstan.yml/badge.svg)](https://github.com/agentsoftware/laravel-prerender/actions/workflows/phpstan.yml)
+[![Dependency Review](https://github.com/agentsoftware/laravel-prerender/actions/workflows/dependency-review.yml/badge.svg)](https://github.com/agentsoftware/laravel-prerender/actions/workflows/dependency-review.yml)
 
 
 This package was developed to give you a quick start to integrate with the
@@ -47,7 +47,7 @@ using Prerender.io since the response always goes through your server.
 You can install the package via composer:
 
 ```shell
-composer require codebar-ag/laravel-prerender
+composer require agentsoftware/laravel-prerender
 ```
 
 If you want to make use of the Prerender.io service, add the following to your `.env` file:
@@ -89,7 +89,7 @@ This may be useful for your local development environment.
 You can publish the config file with:
 
 ```shell
-php artisan vendor:publish --provider="CodebarAg\LaravelPrerender\LaravelPrerenderServiceProvider"
+php artisan vendor:publish --provider="AgentSoftware\LaravelPrerender\LaravelPrerenderServiceProvider"
 ```
 
 Afterwards you can customize the Whitelist/Blacklist on your own.

composer.json

@@ -1,12 +1,12 @@
 {
-    "name": "codebar-ag/laravel-prerender",
+    "name": "agentsoftware/laravel-prerender",
     "description": "Laravel middleware for prerendering javascript-rendered pages on the fly for SEO",
     "keywords": [
         "laravel",
         "prerender",
-        "codebar-ag"
+        "agentsoftware"
     ],
-    "homepage": "https://github.com/codebar-ag/Laravel-Prerender",
+    "homepage": "https://github.com/agentsoftware/Laravel-Prerender",
     "license": "MIT",
     "authors": [
         {
@@ -49,17 +49,17 @@
     },
     "autoload": {
         "psr-4": {
-            "CodebarAg\\LaravelPrerender\\": "src/"
+            "AgentSoftware\\LaravelPrerender\\": "src/"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "CodebarAg\\LaravelPrerender\\Tests\\": "tests/"
+            "AgentSoftware\\LaravelPrerender\\Tests\\": "tests/"
         }
     },
     "scripts": {
-        "test": "vendor/bin/phpunit",
-        "test-coverage": "vendor/bin/phpunit --coverage-html coverage",
+        "test": "vendor/bin/pest",
+        "test-coverage": "vendor/bin/pest --coverage-html coverage",
         "format": "vendor/bin/php-cs-fixer fix --allow-risky=yes --config=.php-cs-fixer.dist.php"
     },
     "config": {
@@ -72,7 +72,7 @@
     "extra": {
         "laravel": {
             "providers": [
-                "CodebarAg\\LaravelPrerender\\LaravelPrerenderServiceProvider"
+                "AgentSoftware\\LaravelPrerender\\LaravelPrerenderServiceProvider"
             ]
         }
     },

phpunit.xml

@@ -5,7 +5,7 @@
          executionOrder="random" failOnWarning="true" failOnRisky="true" failOnEmptyTestSuite="true"
          beStrictAboutOutputDuringTests="true" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
     <testsuites>
-        <testsuite name="codebar Solutions AG Test Suite">
+        <testsuite name="Test Suite">
             <directory>tests</directory>
         </testsuite>
     </testsuites>

phpunit.xml.dist

@@ -5,7 +5,7 @@
          executionOrder="random" failOnWarning="true" failOnRisky="true" failOnEmptyTestSuite="true"
          beStrictAboutOutputDuringTests="true" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
     <testsuites>
-        <testsuite name="codebar Solutions AG Test Suite">
+        <testsuite name="Test Suite">
             <directory>tests</directory>
         </testsuite>
     </testsuites>

src/LaravelPrerenderServiceProvider.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace CodebarAg\LaravelPrerender;
+namespace AgentSoftware\LaravelPrerender;
 
 use Illuminate\Contracts\Http\Kernel;
 use Illuminate\Support\ServiceProvider;

src/PrerenderMiddleware.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace CodebarAg\LaravelPrerender;
+namespace AgentSoftware\LaravelPrerender;
 
 use Closure;
 use GuzzleHttp\Client as Guzzle;
@@ -128,7 +128,7 @@ public function handle(Request $request, Closure $next)
     /**
      * Returns whether the request must be prerendered.
      */
-    private function shouldShowPrerenderedPage(Request $request): bool
+    protected function shouldShowPrerenderedPage(Request $request): bool
     {
         $userAgent = strtolower($request->server->get('HTTP_USER_AGENT'));
         $bufferAgent = $request->server->get('X-BUFFERBOT');
@@ -194,7 +194,7 @@ private function shouldShowPrerenderedPage(Request $request): bool
     /**
      * Prerender the page and return the Guzzle Response.
      */
-    private function getPrerenderedPageResponse(Request $request): ?ResponseInterface
+    protected function getPrerenderedPageResponse(Request $request): ?ResponseInterface
     {
         $headers = [
             'User-Agent' => $request->server->get('HTTP_USER_AGENT'),
@@ -229,15 +229,15 @@ private function getPrerenderedPageResponse(Request $request): ?ResponseInterfac
     /**
      * Convert a Guzzle Response to a Symfony Response.
      */
-    private function buildSymfonyResponseFromGuzzleResponse(ResponseInterface $prerenderedResponse): Response
+    protected function buildSymfonyResponseFromGuzzleResponse(ResponseInterface $prerenderedResponse): Response
     {
         return (new HttpFoundationFactory)->createResponse($prerenderedResponse);
     }
 
     /**
      * Check whether one or more needles are in the given list
      */
-    private function isListed($needles, array $list): bool
+    protected function isListed($needles, array $list): bool
     {
         $needles = Arr::wrap($needles);
 
@@ -256,7 +256,7 @@ private function isListed($needles, array $list): bool
      * Generate the request URL to send to prerender. When useFullURL is false, the legacy URL
      * generation logic is used
      */
-    private function generatePrerenderUrl(Request $request): string
+    protected function generatePrerenderUrl(Request $request): string
     {
         if ($this->useFullURL) {
             return $request->fullUrl();

tests/Pest.php

@@ -1,6 +1,6 @@
 <?php
 
-use CodebarAg\LaravelPrerender\Tests\TestCase;
+use AgentSoftware\LaravelPrerender\Tests\TestCase;
 use GuzzleHttp\Client;
 use GuzzleHttp\Exception\ConnectException;
 use GuzzleHttp\Handler\MockHandler;

tests/TestCase.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace CodebarAg\LaravelPrerender\Tests;
+namespace AgentSoftware\LaravelPrerender\Tests;
 
-use CodebarAg\LaravelPrerender\LaravelPrerenderServiceProvider;
-use CodebarAg\LaravelPrerender\PrerenderMiddleware;
+use AgentSoftware\LaravelPrerender\LaravelPrerenderServiceProvider;
+use AgentSoftware\LaravelPrerender\PrerenderMiddleware;
 use GuzzleHttp\Client;
 use Illuminate\Foundation\Http\Kernel;
 use Illuminate\Support\Facades\Route;