Fixed Scrutinizer issues & major bugs (#58)

- Fixed major scrutinizer issues - Updated readme - Fixed issue with CI launch for other PR types - Fixes for phpunit & composer
umbrellio · Jan 6, 2021 · 6414e0c · 6414e0c
1 parent 14204b2
commit 6414e0c
Show file tree

Hide file tree

Showing 20 changed files with 145 additions and 97 deletions.
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -3,9 +3,11 @@ type:build:
   - ".coveralls.yml"
   - ".gitignore"
   - "ecs.yml"
-  - "composer.json"
   - "phpcs.xml"
 
+dependencies:
+  - "composer.json"
+
 type:helpers:
   - "src/Helpers/**/*"
 
@@ -43,4 +45,3 @@ theme:docs:
   - "CONTRIBUTING.md"
   - "CODE_OF_CONDUCT.md"
   - "src/.meta.php"
-  - "*.md"
diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
@@ -39,24 +39,10 @@ version-resolver:
   major:
     labels:
       - major
-      - refactoring
   minor:
     labels:
-      - feature
       - minor
-      - type:helpers
-      - type:indexes
-      - type:routines
-      - type:schema
-      - type:compilers
   patch:
     labels:
       - patch
-      - type:build
-      - bug
-      - bugfix
-      - hotfix
-      - fix
-      - theme:docs
-      - analysis
   default: patch
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -10,6 +10,13 @@ on:
       - reopened
       - edited
       - synchronize
+      - labeled
+      - assigned
+      - unlabeled
+      - unlocked
+      - review_requested
+      - review_request_removed
+      - unassigned
 
 env:
   COVERAGE: '1'
@@ -71,53 +78,53 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        exclude_group:
-          - WithoutSchema,forPHP8
-        experimental:
-          - false
-        operating_system:
-          - ubuntu-latest
-        postgres:
-          - '10'
-          - '11'
-          - '12'
-        php_versions:
-          - '7.3'
-          - '7.4'
+        coverage: [false]
+        exclude_group: ['WithoutSchema,forPHP8']
+        experimental: [false]
+        operating_system: [ubuntu-latest]
+        postgres: ['10', '11', '12']
+        php_versions: ['7.3', '7.4']
         include:
           - operating_system: 'ubuntu-latest'
             php_versions: '7.3'
             postgres: '9.6'
             experimental: false
+            coverage: true
             exclude_group: WithoutSchema,forPHP8
           - operating_system: 'ubuntu-latest'
             php_versions: '7.3'
             postgres: '13'
             experimental: false
+            coverage: false
             exclude_group: WithoutSchema,forPHP8
           - operating_system: 'ubuntu-latest'
             php_versions: '7.4'
             postgres: '13'
             experimental: false
+            coverage: false
             exclude_group: WithoutSchema,forPHP8
           - operating_system: 'ubuntu-latest'
             php_versions: '8.0'
             postgres: '10'
             experimental: false
+            coverage: false
             exclude_group: WithoutSchema,forPHP7
           - operating_system: 'ubuntu-latest'
             php_versions: '8.0'
             postgres: '11'
             experimental: false
+            coverage: false
             exclude_group: WithoutSchema,forPHP7
           - operating_system: 'ubuntu-latest'
             php_versions: '8.0'
             postgres: '12'
             experimental: false
+            coverage: true
             exclude_group: WithoutSchema,forPHP7
           - operating_system: 'ubuntu-latest'
             php_versions: '8.0'
             postgres: '13'
+            coverage: false
             experimental: false
             exclude_group: WithoutSchema,forPHP7
     runs-on: '${{ matrix.operating_system }}'
@@ -185,7 +192,7 @@ jobs:
               --coverage-text
         working-directory: './'
       - name: Upload coverage results to Coveralls
-        if: ${{ !matrix.experimental }}
+        if: ${{ !matrix.experimental && matrix.coverage }}
         env:
           COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           COVERALLS_PARALLEL: true

diff --git a/README.md b/README.md
@@ -9,13 +9,13 @@
 [![Code Coverage](https://scrutinizer-ci.com/g/umbrellio/laravel-pg-extensions/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/umbrellio/laravel-pg-extensions/?branch=master)
 [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/umbrellio/laravel-pg-extensions/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/umbrellio/laravel-pg-extensions/?branch=master)
 
-This project extends Laravel`s database layer to allow use specific Postgres features without raw queries. 
+This project extends Laravel's database layer to allow use specific Postgres features without raw queries. 
 
 ## Installation
 
 Run this command to install:
 ```bash
-php composer.phar require umbrellio/laravel-pg-extensions
+composer require umbrellio/laravel-pg-extensions
 ```
 
 ## Features

diff --git a/composer.json b/composer.json
@@ -28,6 +28,10 @@
     "umbrellio/laravel-ltree": "Package for working with Postgres LTree extension",
     "umbrellio/laravel-common-objects": "Package with helpers for common Laravel components"
   },
+  "support": {
+    "issues": "https://github.com/umbrellio/laravel-pg-extensions/issues",
+    "source": "https://github.com/umbrellio/laravel-pg-extensions"
+  },
   "require": {
     "php": "^7.2|^7.3|^7.4|^8.0",
     "doctrine/dbal": "2.9.*|^3.0",

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -9,6 +9,14 @@
          stopOnFailure="false"
          xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
 >
+    <coverage processUncoveredFiles="true">
+        <include>
+            <directory suffix=".php">./src</directory>
+        </include>
+        <exclude>
+            <file>./src/.meta.php</file>
+        </exclude>
+    </coverage>
     <php>
         <env name="APP_ENV" value="testing"/>
         <ini name="error_reporting" value="-1" />
@@ -19,14 +27,6 @@
         <var name="db_database" value="${DATABASE}" />
         <var name="db_port" value="5432"/>
     </php>
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">./src</directory>
-            <exclude>
-                <file>./src/.meta.php</file>
-            </exclude>
-        </whitelist>
-    </filter>
     <testsuites>
         <testsuite name="Test suite">
             <directory suffix="Test.php">./tests</directory>

diff --git a/src/.meta.php b/src/.meta.php
@@ -2,6 +2,7 @@
 
 namespace Illuminate\Database\Schema {
 
+    use Closure;
     use Illuminate\Support\Fluent;
     use Umbrellio\Postgres\Schema\Definitions\AttachPartitionDefinition;
     use Umbrellio\Postgres\Schema\Definitions\CheckDefinition;
@@ -11,6 +12,8 @@
     use Umbrellio\Postgres\Schema\Definitions\UniqueDefinition;
 
     /**
+     * @method __construct($table, Closure $callback = null, $prefix = '')
+     *
      * @method AttachPartitionDefinition attachPartition(string $partition)
      * @method void detachPartition(string $partition)
      * @method LikeDefinition like(string $table)
@@ -22,15 +25,33 @@
      * @method ColumnDefinition tsrange(string $column)
      * @method ExcludeDefinition exclude($columns, ?string $index = null)
      * @method CheckDefinition check($columns, ?string $index = null)
+     * @method string getTable()
+     * @method ColumnDefinition|Fluent addColumn($type, $name, array $parameters = [])
+     *
+     * @property bool $temporary
      */
     class Blueprint
     {
+        protected function addCommand($name, array $parameters = []): Fluent
+        {
+            return new Fluent();
+        }
+
+        protected function createIndexName($type, array $columns): string
+        {
+            return '';
+        }
+
+        protected function dropIndexCommand($command, $type, $index): Fluent
+        {
+            return new Fluent();
+        }
     }
 
     /**
      * @method ColumnDefinition using($expression)
      */
-    class ColumnDefinition
+    class ColumnDefinition extends Fluent
     {
     }
 }
diff --git a/src/Compilers/ExcludeCompiler.php b/src/Compilers/ExcludeCompiler.php
@@ -72,7 +72,7 @@ private static function compileWheres(Grammar $grammar, Blueprint $blueprint, Fl
     {
         $wheres = static::build($grammar, $blueprint, $command);
 
-        if ($wheres) {
+        if (!empty($wheres)) {
             return sprintf('WHERE %s', static::removeLeadingBoolean(implode(' ', $wheres)));
         }
 

diff --git a/src/Compilers/UniqueCompiler.php b/src/Compilers/UniqueCompiler.php
@@ -26,7 +26,7 @@ public static function compile(
             'CREATE UNIQUE INDEX %s ON %s (%s) WHERE %s',
             $fluent->get('index'),
             $blueprint->getTable(),
-            implode(',', $fluent->get('columns')),
+            implode(',', (array) $fluent->get('columns')),
             static::removeLeadingBoolean(implode(' ', $wheres))
         );
     }

diff --git a/src/Helpers/ColumnAssertions.php b/src/Helpers/ColumnAssertions.php
@@ -6,13 +6,12 @@
 
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Schema;
-use PHPUnit\Framework\TestCase;
 
-/**
- * @mixin TestCase
- */
 trait ColumnAssertions
 {
+    abstract public static function assertNull($actual, string $message = ''): void;
+    abstract public static function assertSame($expected, $actual, string $message = ''): void;
+
     protected function assertCommentOnColumn(string $table, string $column, ?string $expected = null): void
     {
         $comment = $this->getCommentListing($table, $column);

diff --git a/src/Helpers/IndexAssertions.php b/src/Helpers/IndexAssertions.php
@@ -5,13 +5,20 @@
 namespace Umbrellio\Postgres\Helpers;
 
 use Illuminate\Support\Facades\DB;
-use PHPUnit\Framework\TestCase;
 
-/**
- * @mixin TestCase
- */
 trait IndexAssertions
 {
+    abstract public static function assertNotNull($actual, string $message = ''): void;
+    abstract public static function assertSame($expected, $actual, string $message = ''): void;
+    abstract public static function assertNull($actual, string $message = ''): void;
+    abstract public static function assertMatchesRegularExpression(
+        string $pattern,
+        string $string,
+        string $message = ''
+    ): void;
+    abstract public static function assertTrue($condition, string $message = ''): void;
+    abstract public static function assertFalse($condition, string $message = ''): void;
+
     protected function seeIndex(string $index): void
     {
         $this->assertNotNull($this->getIndexListing($index));
@@ -35,7 +42,7 @@ protected function assertRegExpIndex(string $index, string $expectedDef): void
         $definition = $this->getIndexListing($index);
 
         $this->seeIndex($index);
-        $this->assertMatchesRegularExpression($expectedDef, $definition);
+        $this->assertMatchesRegularExpression($expectedDef, $definition ?: '');
     }
 
     protected function dontSeeConstraint(string $table, string $index): void
@@ -57,15 +64,14 @@ private function getIndexListing($index): ?string
 
     private function existConstraintOnTable(string $table, string $index): bool
     {
-        $definition = DB::selectOne('
+        $expression = '
             SELECT c.conname
             FROM pg_constraint c
             LEFT JOIN pg_class t ON c.conrelid  = t.oid
             LEFT JOIN pg_class t2 ON c.confrelid = t2.oid
             WHERE t.relname = ? AND c.conname = ?;
-        ',
-            [$table, $index]
-        );
+        ';
+        $definition = DB::selectOne($expression, [$table, $index]);
         return $definition ? true : false;
     }
 }
diff --git a/src/Helpers/TableAssertions.php b/src/Helpers/TableAssertions.php
@@ -5,13 +5,12 @@
 namespace Umbrellio\Postgres\Helpers;
 
 use Illuminate\Support\Facades\Schema;
-use PHPUnit\Framework\TestCase;
 
-/**
- * @mixin TestCase
- */
 trait TableAssertions
 {
+    abstract public static function assertSame($expected, $actual, string $message = ''): void;
+    abstract public static function assertTrue($condition, string $message = ''): void;
+
     protected function assertCompareTables(string $sourceTable, string $destinationTable): void
     {
         $this->assertSame($this->getTableDefinition($sourceTable), $this->getTableDefinition($destinationTable));

diff --git a/src/Helpers/ViewAssertions.php b/src/Helpers/ViewAssertions.php
@@ -5,13 +5,13 @@
 namespace Umbrellio\Postgres\Helpers;
 
 use Illuminate\Support\Facades\Schema;
-use PHPUnit\Framework\TestCase;
 
-/**
- * @mixin TestCase
- */
 trait ViewAssertions
 {
+    abstract public static function assertSame($expected, $actual, string $message = ''): void;
+    abstract public static function assertTrue($condition, string $message = ''): void;
+    abstract public static function assertFalse($condition, string $message = ''): void;
+
     protected function assertSameView(string $expectedDef, string $view): void
     {
         $definition = $this->getViewDefinition($view);

diff --git a/src/PostgresConnection.php b/src/PostgresConnection.php
@@ -22,6 +22,8 @@ class PostgresConnection extends BasePostgresConnection
 {
     use Macroable;
 
+    public $name;
+
     private static $extensions = [];
 
     private $initialTypes = [
@@ -135,7 +137,8 @@ private function registerExtensions(): void
             /** @var AbstractExtension $extension */
             $extension::register();
             foreach ($extension::getTypes() as $type => $typeClass) {
-                $this->getSchemaBuilder()
+                $this
+                    ->getSchemaBuilder()
                     ->registerCustomDoctrineType($typeClass, $type, $type);
             }
         });
@@ -147,7 +150,8 @@ private function overrideDoctrineBehavior(Connection $connection): Connection
         if (!$eventManager->hasListeners(Events::onSchemaAlterTableChangeColumn)) {
             $eventManager->addEventSubscriber(new SchemaAlterTableChangeColumnSubscriber());
         }
-        $connection->getDatabasePlatform()
+        $connection
+            ->getDatabasePlatform()
             ->setEventManager($eventManager);
         return $connection;
     }