5.0.x

.github/workflows/tests.yml

@@ -2,23 +2,25 @@ name: Unit Testing
 
 on:
   push:
-    branches: [ "master" ]
+    branches: [ "5.0.x" ]
   pull_request:
-    branches: [ "master" ]
+    branches: [ "5.0.x" ]
 
 permissions:
   contents: read
 
 jobs:
-  build:
+  tests:
 
     runs-on: ubuntu-latest
 
     strategy:
       fail-fast: true
       matrix:
-        php: [7.4]
+        php: [8.1, 8.2]
+        stability: [prefer-stable]
 
+    name: PHP ${{ matrix.php }} - ${{ matrix.stability }}
     steps:
     - uses: actions/checkout@v3
 
@@ -28,10 +30,24 @@ jobs:
         php-version: ${{ matrix.php }}
         extensions: curl, gmp, json, mbstring, openssl
         tools: composer:v2
-        coverage: none
+        coverage: xdebug
 
     - name: Install dependencies
-      run: composer update --prefer-dist --no-interaction --no-progress
+      run: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress
 
-    - name: Execute tests
-      run: vendor/bin/phpunit --verbose
+    - name: Download Codeclimate Tools
+      if: ${{ github.event_name != 'pull_request' }}
+      run: curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter && chmod +x ./cc-test-reporter
+
+    - name: Init Codeclimate Tools
+      if: ${{ github.event_name != 'pull_request' }}
+      run: ./cc-test-reporter before-build
+
+    - name: Run Tests
+      run: vendor/bin/phpunit --coverage-clover build/logs/clover.xml
+
+    - name: Publish code coverage
+      if: ${{ github.event_name != 'pull_request' }}
+      env:
+        CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
+      run: ./cc-test-reporter after-build -t clover

composer.json

@@ -10,33 +10,40 @@
   ],
   "autoload": {
     "psr-4": {
-      "Seat\\Services\\": "src/"
+      "Seat\\Services\\": "src/",
+      "Seat\\Services\\Database\\Seeders\\": "src/database/seeders/"
     },
     "files": [
       "src/Helpers/helpers.php"
     ]
   },
+  "autoload-dev": {
+    "psr-4": {
+      "Seat\\Tests\\Services\\": "tests/"
+    }
+  },
   "minimum-stability": "dev",
   "prefer-stable": true,
   "require": {
-    "php": "^7.3",
+    "php": "^8.1",
+    "ext-dom": "*",
     "ext-gmp": "*",
     "ext-json": "*",
     "ext-mbstring": "*",
     "ext-openssl": "*",
     "composer-runtime-api": "^2.0",
-    "coduo/php-humanizer": "^3.0",
-    "composer/semver": "^2.0",
-    "doctrine/dbal": "^2.9",
-    "guzzlehttp/guzzle": "^6.3",
-    "laravel/framework": "^6.2",
-    "web-token/jwt-easy": "^2.1",
-    "web-token/jwt-signature-algorithm-hmac": "^2.1",
-    "web-token/jwt-signature-algorithm-rsa": "^2.1",
-    "web-token/jwt-signature-algorithm-ecdsa": "^2.1"
+    "coduo/php-humanizer": "^4.0",
+    "composer/semver": "^3.0",
+    "doctrine/dbal": "^3.0",
+    "eveseat/eseye": "^3.1",
+    "guzzlehttp/guzzle": "^7.0",
+    "laravel/framework": "^10.0",
+    "psr/simple-cache": "^3.0",
+    "psr/log": "^3.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "^9.5"
+    "phpunit/phpunit": "^10.0",
+    "orchestra/testbench": "^8.0"
   },
   "extra": {
     "laravel": {

phpunit.xml

@@ -1,17 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit colors="true"
-         bootstrap="./vendor/autoload.php"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true">
-    <coverage>
-        <include>
-            <directory suffix=".php">./src/</directory>
-        </include>
-    </coverage>
-    <testsuites>
-        <testsuite name="Report Parser Test Suite">
-            <directory>./tests/ReportParser</directory>
-        </testsuite>
-    </testsuites>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" colors="true" bootstrap="./vendor/autoload.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.1/phpunit.xsd" cacheDirectory=".phpunit.cache">
+  <coverage/>
+  <testsuites>
+    <testsuite name="Report Parser Test Suite">
+      <directory>./tests/ReportParser</directory>
+    </testsuite>
+    <testsuite name="Injected Relations Test Suite">
+      <directory>./tests/InjectedRelations</directory>
+    </testsuite>
+    <testsuite name="CCP HTML CLeaning Test Suite">
+      <directory>./tests/CleanCCPHtml</directory>
+    </testsuite>
+  </testsuites>
+  <source>
+    <include>
+      <directory suffix=".php">./src/</directory>
+    </include>
+  </source>
 </phpunit>

src/AbstractSeatPlugin.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of SeAT
  *
- * Copyright (C) 2015 to 2022 Leon Jacobs
+ * Copyright (C) 2015 to present Leon Jacobs
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -37,6 +37,7 @@ abstract class AbstractSeatPlugin extends ServiceProvider
      * Return an URI to a CHANGELOG.md file or an API path which will be providing changelog history.
      *
      * @example https://raw.githubusercontent.com/eveseat/seat/master/LICENSE
+     *
      * @exemple https://api.github.com/repos/eveseat/web/releases
      *
      * @return string|null
@@ -146,10 +147,8 @@ abstract public function getPackagistVendorName(): string;
      * Return the plugin installed version.
      *
      * @return string
-     *
-     * @deprecated This method will be non longer overridable in the future.
      */
-    public function getVersion(): string
+    final public function getVersion(): string
     {
         $name = sprintf('%s/%s', $this->getPackagistVendorName(), $this->getPackagistPackageName());
 
@@ -201,7 +200,7 @@ final public function registerPermissions(string $permissions_path, string $scop
     final public function registerApiAnnotationsPath($paths)
     {
         // ensure current annotation setting is an array of path or transform into it
-        $current_annotations = config('l5-swagger.paths.annotations', []);
+        $current_annotations = config('l5-swagger.documentations.default.paths.annotations', []);
 
         if (! is_array($current_annotations))
             $current_annotations = [$current_annotations];
@@ -211,7 +210,7 @@ final public function registerApiAnnotationsPath($paths)
 
         // merge paths together and update config
         config([
-            'l5-swagger.paths.annotations' => array_unique(array_merge($current_annotations, $paths)),
+            'l5-swagger.documentations.default.paths.annotations' => array_unique(array_merge($current_annotations, $paths)),
         ]);
     }
 
@@ -231,4 +230,22 @@ final public function registerSdeTables($tables)
             'seat.sde.tables' => array_unique(array_merge($current_tables, $tables)),
         ]);
     }
+
+    /**
+     * Register database seeders in the stack.
+     *
+     * @param  string|array  $classes
+     * @return void
+     */
+    final public function registerDatabaseSeeders(string|array $classes)
+    {
+        $current_seeders = config('seat.seeders', []);
+
+        if (! is_array($classes))
+            $classes = [$classes];
+
+        config([
+            'seat.seeders' => array_unique(array_merge($current_seeders, $classes)),
+        ]);
+    }
 }

src/Commands/Seat/Admin/Email.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of SeAT
  *
- * Copyright (C) 2015 to 2022 Leon Jacobs
+ * Copyright (C) 2015 to present Leon Jacobs
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/Commands/Seat/Version.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of SeAT
  *
- * Copyright (C) 2015 to 2022 Leon Jacobs
+ * Copyright (C) 2015 to present Leon Jacobs
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/Config/services.config.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of SeAT
  *
- * Copyright (C) 2015 to 2022 Leon Jacobs
+ * Copyright (C) 2015 to present Leon Jacobs
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/Contracts/EsiClient.php

@@ -0,0 +1,104 @@
+<?php
+
+/*
+ * This file is part of SeAT
+ *
+ * Copyright (C) 2015 to present Leon Jacobs
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+namespace Seat\Services\Contracts;
+
+use Psr\Log\LoggerInterface;
+use Psr\SimpleCache\CacheInterface;
+
+interface EsiClient
+{
+    /**
+     * @return \Seat\Services\Contracts\EsiToken
+     */
+    public function getAuthentication(): EsiToken;
+
+    /**
+     * @param  \Seat\Services\Contracts\EsiToken  $authentication
+     * @return $this
+     */
+    public function setAuthentication(EsiToken $authentication): self;
+
+    /**
+     * @return bool
+     */
+    public function isAuthenticated(): bool;
+
+    /**
+     * @return string
+     */
+    public function getVersion(): string;
+
+    /**
+     * @param  string  $version
+     * @return $this
+     */
+    public function setVersion(string $version): self;
+
+    /**
+     * @return array
+     */
+    public function getQueryString(): array;
+
+    /**
+     * @param  array  $query
+     * @return $this
+     */
+    public function setQueryString(array $query): self;
+
+    /**
+     * @return array
+     */
+    public function getBody(): array;
+
+    /**
+     * @param  array  $body
+     * @return $this
+     */
+    public function setBody(array $body): self;
+
+    /**
+     * @param  string  $method
+     * @param  string  $uri
+     * @param  array  $uri_data
+     * @return \Seat\Services\Contracts\EsiResponse
+     */
+    public function invoke(string $method, string $uri, array $uri_data = []): EsiResponse;
+
+    /**
+     * @param  int  $page
+     * @return $this
+     */
+    public function page(int $page): self;
+
+    /**
+     * @return \Psr\Log\LoggerInterface
+     */
+    public function getLogger(): LoggerInterface;
+
+    /**
+     * @return \Psr\SimpleCache\CacheInterface
+     */
+    public function getCache(): CacheInterface;
+
+    public function getValidAccessToken(): string;
+}