wip

Author: Moath Alhajri

.github/workflows/tests.yml

@@ -9,7 +9,7 @@ jobs:
             fail-fast: true
             matrix:
                 os: [ubuntu-latest]
-                php: ["8.0", 8.1, 8.2]
+                php: ["8.0", 8.1, 8.2, 8.3, 8.4]
                 stability: [prefer-lowest, prefer-stable]
 
         name: Tests php@${{ matrix.php }} - ${{ matrix.os }} - ${{ matrix.stability }}

CONTRIBUTING.md

@@ -25,14 +25,6 @@ Clone your fork, then install the dev dependencies:
 composer install
 ```
 
-## Refactor
-
-Refactor your code:
-
-```bash
-composer refactor
-```
-
 ## Lint
 
 Lint your code:
@@ -82,4 +74,4 @@ If you want to check things work against a specific version of PHP, you may incl
 docker compose build --build-arg PHP=8.2
 ```
 
-The default PHP version will always be the lowest version of PHP supported by jql-builder.
+The default PHP version will always be the lowest version of PHP supported by jql-builder.

composer.json

@@ -28,7 +28,6 @@
         "phpstan/extension-installer": "^1.2",
         "phpstan/phpstan": "^1.8.6",
         "phpstan/phpstan-strict-rules": "^1.4",
-        "rector/rector": "^0.15.0",
         "symfony/var-dumper": "^6.0.0"
     },
     "autoload": {
@@ -60,14 +59,11 @@
     },
     "scripts": {
         "lint": "pint --preset laravel -v --ansi",
-        "refactor": "rector --debug --ansi",
         "test:lint": "pint --preset laravel --test -v --ansi",
-        "test:refactor": "rector --dry-run --ansi",
         "test:types": "phpstan analyse --ansi",
         "test:unit": "pest --colors=always --min=100 --order-by=random --coverage",
         "test": [
             "@test:lint",
-            "@test:refactor",
             "@test:types",
             "@test:unit"
         ]

rector.php

@@ -3,15 +3,15 @@
 use JqlBuilder\Jql;
 
 it('can generate query', function () {
-    $builder = new Jql();
+    $builder = new Jql;
 
     $query = $builder->where('project', '=', 'MY PROJECT')->getQuery();
 
     $expected = 'project = "MY PROJECT"';
 
     expect($query)->toBe($expected);
 
-    $builder = new Jql();
+    $builder = new Jql;
 
     $query = $builder
         ->where('project', '=', 'MY PROJECT')
@@ -28,7 +28,7 @@
 
     expect($query)->toBe($expected);
 
-    $builder = new Jql();
+    $builder = new Jql;
 
     $query = (string) $builder
         ->where('project', 'MY PROJECT')
@@ -48,7 +48,7 @@
 });
 
 it('can generate raw query', function () {
-    $query = (string) (new Jql())->rawQuery('project = "MY PROJECT"');
+    $query = (string) (new Jql)->rawQuery('project = "MY PROJECT"');
 
     $expected = 'project = "MY PROJECT"';
 
@@ -57,7 +57,7 @@
 
 it('can generate query with grouped conditions', function () {
     $actualQueries = [
-        (new Jql())->where('creator', '=', '1646667083862@mailinator.com')
+        (new Jql)->where('creator', '=', '1646667083862@mailinator.com')
             ->where(function (Jql $builder) {
                 $builder->where('project', '=', 'A')
                     ->where('status', '=', '"Closed"');
@@ -66,7 +66,7 @@
                 $builder->where('project', '=', '"B"')
                     ->where('status', '!=', 'Closed');
             })->getQuery(),
-        (new Jql())->where(function (Jql $builder) {
+        (new Jql)->where(function (Jql $builder) {
             $builder->where('project', '=', 'A')
                 ->where('status', '=', 'Closed');
         })->orWhere(function (Jql $builder) {
@@ -84,15 +84,15 @@
 });
 
 it('will quote custom field that contains spaces', function () {
-    $query = (new Jql())->where('project name', '=', 'MY PROJECT')->getQuery();
+    $query = (new Jql)->where('project name', '=', 'MY PROJECT')->getQuery();
 
     $expected = '"project name" = "MY PROJECT"';
 
     expect($query)->toBe($expected);
 });
 
 it('can add macro', function () {
-    $builder = new Jql();
+    $builder = new Jql;
 
     $builder::macro('whereCustom', function (mixed $value) {
         /** @var Jql $this */
@@ -108,15 +108,15 @@
 });
 
 it('will throw exception when invalid boolean passed', function () {
-    (new Jql())->where('project', '=', 'MY PROJECT', '=');
+    (new Jql)->where('project', '=', 'MY PROJECT', '=');
 })->throws(InvalidArgumentException::class, 'Illegal boolean [=] value. only [and, or] is acceptable');
 
 it('will throw exception when invalid operator passed', function () {
-    (new Jql())->where('project', '=', ['MY PROJECT']);
+    (new Jql)->where('project', '=', ['MY PROJECT']);
 })->throws(InvalidArgumentException::class, 'Illegal operator [=] value. only [in, not in, was in, was not in] is acceptable when $value type is array');
 
 it('can reset the current query', function () {
-    $query = new Jql();
+    $query = new Jql;
 
     $query->where('project', 'name');