Merge pull request #18 from Naoray/fix/dbal-version-requirement

resolves #16

.github/workflows/cs-fixer.yml

@@ -13,7 +13,7 @@ jobs:
             -   name: Fix style
                 uses: docker://oskarstark/php-cs-fixer-ga
                 with:
-                    args: --config=.php_cs --allow-risky=yes
+                    args: --config=.php-cs-fixer.dist.php --allow-risky=yes
 
             -   name: Extract branch name
                 shell: bash

.php-cs-fixer.cache

@@ -0,0 +1 @@
+{"php":"8.0.5","version":"3.0.0","indent":"    ","lineEnding":"\n","rules":{"binary_operator_spaces":{"default":"single_space","operators":{"=>":null}},"blank_line_after_namespace":true,"blank_line_after_opening_tag":true,"blank_line_before_statement":{"statements":["return"]},"braces":true,"cast_spaces":true,"class_attributes_separation":{"elements":{"method":"one"}},"class_definition":true,"concat_space":{"spacing":"none"},"declare_equal_normalize":true,"elseif":true,"encoding":true,"full_opening_tag":true,"fully_qualified_strict_types":true,"function_declaration":true,"function_typehint_space":true,"heredoc_to_nowdoc":true,"include":true,"increment_style":{"style":"post"},"indentation_type":true,"linebreak_after_opening_tag":true,"line_ending":true,"lowercase_cast":true,"constant_case":true,"lowercase_keywords":true,"lowercase_static_reference":true,"magic_method_casing":true,"magic_constant_casing":true,"method_argument_space":true,"native_function_casing":true,"no_alias_functions":true,"no_extra_blank_lines":{"tokens":["extra","throw","use","use_trait"]},"no_blank_lines_after_class_opening":true,"no_blank_lines_after_phpdoc":true,"no_closing_tag":true,"no_empty_phpdoc":true,"no_empty_statement":true,"no_leading_import_slash":true,"no_leading_namespace_whitespace":true,"no_mixed_echo_print":{"use":"echo"},"no_multiline_whitespace_around_double_arrow":true,"multiline_whitespace_before_semicolons":{"strategy":"no_multi_line"},"no_short_bool_cast":true,"no_singleline_whitespace_before_semicolons":true,"no_spaces_after_function_name":true,"no_spaces_around_offset":true,"no_spaces_inside_parenthesis":true,"no_trailing_comma_in_list_call":true,"no_trailing_comma_in_singleline_array":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"no_unneeded_control_parentheses":true,"no_unreachable_default_argument_value":true,"no_useless_return":true,"no_whitespace_before_comma_in_array":true,"no_whitespace_in_blank_line":true,"normalize_index_brace":true,"not_operator_with_successor_space":true,"object_operator_without_whitespace":true,"ordered_imports":{"sort_algorithm":"alpha"},"phpdoc_indent":true,"general_phpdoc_tag_rename":{"fix_inline":true},"phpdoc_no_access":true,"phpdoc_no_package":true,"phpdoc_no_useless_inheritdoc":true,"phpdoc_scalar":true,"phpdoc_single_line_var_spacing":true,"phpdoc_summary":true,"phpdoc_to_comment":true,"phpdoc_trim":true,"phpdoc_types":true,"phpdoc_var_without_name":true,"psr_autoloading":true,"self_accessor":true,"short_scalar_cast":true,"single_blank_line_at_eof":true,"single_blank_line_before_namespace":true,"single_class_element_per_statement":true,"single_import_per_statement":true,"single_line_after_imports":true,"single_line_comment_style":{"comment_types":["hash"]},"single_quote":true,"space_after_semicolon":true,"standardize_not_equals":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"ternary_operator_spaces":true,"trailing_comma_in_multiline":true,"trim_array_spaces":true,"unary_operator_spaces":true,"visibility_required":{"elements":["method","property"]},"whitespace_after_comma_in_array":true},"hashes":{"src\/RelationMethod.php":225983206,"src\/Traits\/InteractsWithRelationMethods.php":3669279658,"src\/Analyzer.php":389463670,"src\/Contracts\/Detector.php":1317529154,"src\/Column.php":2334222462,"src\/Detectors\/RelationMethodDetector.php":3732826382,"src\/Detectors\/ColumnsDetector.php":988109509,"tests\/ColumnsDetectorTest.php":1482384567,"tests\/RelationMethodDetectorTest.php":4064357608,"tests\/TestCase.php":4165396647}}

.php-cs-fixer.dist.php

@@ -0,0 +1,141 @@
+<?php
+
+use PhpCsFixer\Config;
+use PhpCsFixer\Finder;
+
+$rules = [
+    'binary_operator_spaces' => [
+        'default' => 'single_space',
+        'operators' => ['=>' => null],
+    ],
+    'blank_line_after_namespace' => true,
+    'blank_line_after_opening_tag' => true,
+    'blank_line_before_statement' => [
+        'statements' => ['return'],
+    ],
+    'braces' => true,
+    'cast_spaces' => true,
+    'class_attributes_separation' => [
+        'elements' => ['method' => 'one'],
+    ],
+    'class_definition' => true,
+    'concat_space' => [
+        'spacing' => 'none',
+    ],
+    'declare_equal_normalize' => true,
+    'elseif' => true,
+    'encoding' => true,
+    'full_opening_tag' => true,
+    'fully_qualified_strict_types' => true, // added by Shift
+    'function_declaration' => true,
+    'function_typehint_space' => true,
+    'heredoc_to_nowdoc' => true,
+    'include' => true,
+    'increment_style' => ['style' => 'post'],
+    'indentation_type' => true,
+    'linebreak_after_opening_tag' => true,
+    'line_ending' => true,
+    'lowercase_cast' => true,
+    'constant_case' => true,
+    'lowercase_keywords' => true,
+    'lowercase_static_reference' => true, // added from Symfony
+    'magic_method_casing' => true, // added from Symfony
+    'magic_constant_casing' => true,
+    'method_argument_space' => true,
+    'native_function_casing' => true,
+    'no_alias_functions' => true,
+    'no_extra_blank_lines' => [
+        'tokens' => [
+            'extra',
+            'throw',
+            'use',
+            'use_trait',
+        ],
+    ],
+    'no_blank_lines_after_class_opening' => true,
+    'no_blank_lines_after_phpdoc' => true,
+    'no_closing_tag' => true,
+    'no_empty_phpdoc' => true,
+    'no_empty_statement' => true,
+    'no_leading_import_slash' => true,
+    'no_leading_namespace_whitespace' => true,
+    'no_mixed_echo_print' => [
+        'use' => 'echo',
+    ],
+    'no_multiline_whitespace_around_double_arrow' => true,
+    'multiline_whitespace_before_semicolons' => [
+        'strategy' => 'no_multi_line',
+    ],
+    'no_short_bool_cast' => true,
+    'no_singleline_whitespace_before_semicolons' => true,
+    'no_spaces_after_function_name' => true,
+    'no_spaces_around_offset' => true,
+    'no_spaces_inside_parenthesis' => true,
+    'no_trailing_comma_in_list_call' => true,
+    'no_trailing_comma_in_singleline_array' => true,
+    'no_trailing_whitespace' => true,
+    'no_trailing_whitespace_in_comment' => true,
+    'no_unneeded_control_parentheses' => true,
+    'no_unreachable_default_argument_value' => true,
+    'no_useless_return' => true,
+    'no_whitespace_before_comma_in_array' => true,
+    'no_whitespace_in_blank_line' => true,
+    'normalize_index_brace' => true,
+    'not_operator_with_successor_space' => true,
+    'object_operator_without_whitespace' => true,
+    'ordered_imports' => ['sort_algorithm' => 'alpha'],
+    'phpdoc_indent' => true,
+    'general_phpdoc_tag_rename' => ['fix_inline' => true],
+    'phpdoc_no_access' => true,
+    'phpdoc_no_package' => true,
+    'phpdoc_no_useless_inheritdoc' => true,
+    'phpdoc_scalar' => true,
+    'phpdoc_single_line_var_spacing' => true,
+    'phpdoc_summary' => true,
+    'phpdoc_to_comment' => true,
+    'phpdoc_trim' => true,
+    'phpdoc_types' => true,
+    'phpdoc_var_without_name' => true,
+    'psr_autoloading' => true,
+    'self_accessor' => true,
+    'short_scalar_cast' => true,
+    'simplified_null_return' => false, // disabled by Shift
+    'single_blank_line_at_eof' => true,
+    'single_blank_line_before_namespace' => true,
+    'single_class_element_per_statement' => true,
+    'single_import_per_statement' => true,
+    'single_line_after_imports' => true,
+    'single_line_comment_style' => [
+        'comment_types' => ['hash'],
+    ],
+    'single_quote' => true,
+    'space_after_semicolon' => true,
+    'standardize_not_equals' => true,
+    'switch_case_semicolon_to_colon' => true,
+    'switch_case_space' => true,
+    'ternary_operator_spaces' => true,
+    'trailing_comma_in_multiline' => true,
+    'trim_array_spaces' => true,
+    'unary_operator_spaces' => true,
+    'visibility_required' => [
+        'elements' => ['method', 'property'],
+    ],
+    'whitespace_after_comma_in_array' => true,
+];
+
+$project_path = getcwd();
+$finder = Finder::create()
+    ->notPath('vendor')
+    ->in([
+        __DIR__ . '/src',
+        __DIR__ . '/tests',
+    ])
+    ->name('*.php')
+    ->ignoreDotFiles(true)
+    ->ignoreVCS(true);
+
+$config = new Config();
+return $config->setFinder($finder)
+    ->setRules($rules)
+    ->setRiskyAllowed(true)
+    ->setUsingCache(true);

composer.json

@@ -1,30 +1,30 @@
 {
-    "name": "naoray/eloquent-model-analyzer",
-    "description": "Helpful methods to gain more information about eloquent model classes.",
-    "type": "pakage",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Krishan Koenig",
-            "email": "[email protected]"
-        }
-    ],
-    "require": {
-        "illuminate/database": "^6.0|^7.30.4|^8.40.0",
-        "illuminate/support": "^6.0|^7.3|^8.24.0",
-        "doctrine/dbal": "^2.10"
-    },
-    "require-dev": {
-        "orchestra/testbench": "^5.1|^6.0"
-    },
-    "autoload": {
-        "psr-4": {
-            "Naoray\\EloquentModelAnalyzer\\": "./src"
-        }
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "Naoray\\EloquentModelAnalyzer\\Tests\\": "tests"
-        }
+  "name": "naoray/eloquent-model-analyzer",
+  "description": "Helpful methods to gain more information about eloquent model classes.",
+  "type": "pakage",
+  "license": "MIT",
+  "authors": [
+    {
+      "name": "Krishan Koenig",
+      "email": "[email protected]"
     }
+  ],
+  "require": {
+    "illuminate/database": "^6.0|^7.30.4|^8.40.0",
+    "illuminate/support": "^6.0|^7.3|^8.24.0",
+    "doctrine/dbal": "^2.6|^3.0"
+  },
+  "require-dev": {
+    "orchestra/testbench": "^5.1|^6.0"
+  },
+  "autoload": {
+    "psr-4": {
+      "Naoray\\EloquentModelAnalyzer\\": "./src"
+    }
+  },
+  "autoload-dev": {
+    "psr-4": {
+      "Naoray\\EloquentModelAnalyzer\\Tests\\": "tests"
+    }
+  }
 }

src/Column.php

@@ -48,7 +48,7 @@ public function toArray(): array
             'unsigned'      => $this->data->getUnsigned(),
             'unique'        => $this->isUnique(),
             'isForeignKey'  => $this->isForeignKey(),
-            'nullable'      => !$this->data->getNotnull(),
+            'nullable'      => ! $this->data->getNotnull(),
             'autoincrement' => $this->data->getAutoincrement(),
         ];
     }

src/RelationMethod.php

@@ -71,7 +71,7 @@ public function getRelatedClass(): string
          * If classname does not use ::class notation
          * we consider it as a full class string reference.
          */
-        if (!$className->is('*::class')) {
+        if (! $className->is('*::class')) {
             return $className;
         }