Merge pull request #2 from subugoe/main

Sync Forked Repo

.github/workflows/ci.yml

@@ -0,0 +1,52 @@
+name: CI
+
+on: [ push, pull_request ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    continue-on-error: ${{ matrix.env.experimental == true }}
+    strategy:
+      fail-fast: false
+      matrix:
+        env:
+          - { php: 7.4 }
+
+    env: ${{ matrix.env }}
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.env.php }}
+          tools: composer
+          extensions: pdo, sqlite3
+
+      # composer
+      - name: Update Composer
+        run: |
+          sudo composer self-update
+          composer --version
+      - name: Validate composer.json and composer.lock
+        run: composer validate
+
+      - name: Cache dependencies
+        uses: actions/cache@v1
+        with:
+          path: ~/.composer/cache
+          key: dependencies-composer-${{ hashFiles('composer.json') }}
+
+      - name: Install dependencies
+        run: composer install
+
+      - name: Check coding style
+        run: composer lint
+
+      - name: Run Unit Tests
+        run: |
+          echo "Running unit tests with $(which php)";
+          .Build/bin/phpunit --colors -c .Build/vendor/nimut/testing-framework/res/Configuration/UnitTests.xml Tests/Unit/;

.gitignore

@@ -5,3 +5,5 @@ vendor/*
 /composer.lock
 /.Build
 /.php_cs.cache
+/.php-cs-fixer.cache
+var

.php-version

@@ -0,0 +1 @@
+7.4

Classes/Controller/SearchController.php

@@ -39,20 +39,11 @@
 
 class SearchController extends ActionController
 {
-    /**
-     * @var array
-     */
-    protected $requestArguments;
+    protected array $requestArguments = [];
 
-    /**
-     * @var ServiceProviderInterface
-     */
-    protected $searchProvider;
+    protected ?object $searchProvider = null;
 
-    /**
-     * @var \Psr\Log\LoggerInterface
-     */
-    private $logger;
+    private \Psr\Log\LoggerInterface $logger;
 
     public function __construct(LogManagerInterface $logManager)
     {
@@ -79,6 +70,7 @@ public function detailAction(string $id)
                     )
                 );
         }
+
         $this->addStandardAssignments();
 
         $this->view->assignMultiple($detail);
@@ -103,9 +95,7 @@ public function indexAction()
                     $this->settings,
                     null,
                     $this->searchProvider->getRequestArguments()
-                ),
-            false,
-            true
+                )
             );
 
             $this->addStandardAssignments();
@@ -124,14 +114,15 @@ public function indexAction()
     /**
      * Initialisation and setup.
      */
-    public function initializeAction()
+    protected function initializeAction()
     {
         ksort($this->settings['queryFields']);
 
         $this->initializeConnection($this->settings['activeConnection']);
 
         $this->requestArguments = $this->request->getArguments();
         $this->requestArguments = ArrayUtility::cleanArgumentsArray($this->requestArguments);
+
         $this->searchProvider->setRequestArguments($this->requestArguments);
         $this->searchProvider->setAction($this->request->getControllerActionName());
         $this->searchProvider->setControllerExtensionKey($this->request->getControllerExtensionKey());

Classes/Hooks/RealUrl.php

@@ -37,7 +37,6 @@ class RealUrl
      * Create automatic RealUrl Configuratoin.
      *
      * @param $params
-     * @param $pObj
      *
      * @return array
      */

Classes/Service/AbstractServiceProvider.php

@@ -8,31 +8,18 @@
 
 abstract class AbstractServiceProvider implements ServiceProviderInterface
 {
-    /**
-     * @var string
-     */
-    protected $connectionName;
+    protected string $connectionName;
 
     /**
      * @var LogManagerInterface
      */
     protected $logger;
 
-    /**
-     * @var array
-     */
-    protected $requestArguments;
+    protected array $requestArguments = [];
 
-    /**
-     * @var array
-     */
-    protected $settings;
+    protected array $settings = [];
 
-    /**
-     * @param string $connectionName
-     * @param array  $settings
-     */
-    public function __construct($connectionName, $settings)
+    public function __construct(string $connectionName, array $settings)
     {
         $this->connectionName = $connectionName;
         $this->settings = $settings;

Classes/Service/ServiceProviderInterface.php

@@ -32,11 +32,7 @@
  */
 interface ServiceProviderInterface
 {
-    /**
-     * @param string $connectionName
-     * @param array  $settings
-     */
-    public function __construct($connectionName, $settings);
+    public function __construct(string $connectionName, array $settings);
 
     public function connect();