Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit d5f92b2

Browse files
Merge pull request #134 from nilportugues/php81-upgrade-strict-types
Codebase to PHP 8.1, added strict types, and modernized the syntax
2 parents ca6e9dd + 0717100 commit d5f92b2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+2853
-4020
lines changed

‎.php-cs-fixer.cache

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"php":"8.3.6","version":"3.75.0:v3.75.0#399a128ff2fdaf4281e4e79b755693286cdf325c","indent":" ","lineEnding":"\n","rules":{"binary_operator_spaces":{"default":"at_least_single_space"},"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"blank_lines_before_namespace":true,"braces_position":{"allow_single_line_empty_anonymous_classes":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_type_declaration":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_parentheses":true,"no_blank_lines_after_class_opening":true,"no_extra_blank_lines":{"tokens":["use"]},"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"imports_order":["class","function","const"],"sort_algorithm":"none"},"return_type_declaration":true,"short_scalar_cast":true,"single_import_per_statement":{"group_to_single_imports":false},"single_space_around_construct":{"constructs_followed_by_a_single_space":["abstract","as","case","catch","class","const_import","do","else","elseif","final","finally","for","foreach","function","function_import","if","insteadof","interface","namespace","new","private","protected","public","static","switch","trait","try","use","use_lambda","while"],"constructs_preceded_by_a_single_space":["as","else","elseif","use_lambda"]},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"unary_operator_spaces":{"only_dec_inc":true},"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"control_structure_braces":true,"control_structure_continuation_position":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"attribute_placement":"ignore","on_multiline":"ensure_fully_multiline"},"no_break_comment":true,"no_closing_tag":true,"no_multiple_statements_per_line":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"spaces_inside_parentheses":true,"statement_indentation":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"strict_param":true,"array_syntax":{"syntax":"short"},"declare_strict_types":true},"hashes":{"src\/Syntax\/Table.php":"311ab08c9f9ed676a206ee4459044ba8","src\/Syntax\/QueryPartInterface.php":"73638a7a5265efc707656563f903019e","src\/Syntax\/Column.php":"6f9f7356e9c47dbfffe5647d5ef96988","src\/Syntax\/OrderBy.php":"d61b92e80d238e78c7808c14c4d39568","src\/Syntax\/Where.php":"fa919cae31f2d26d68a64588a415de22","src\/Syntax\/SyntaxFactory.php":"39463cae18a0d3bcfbb0258f1588f0eb","src\/Builder\/BuilderException.php":"a8de7286e59c90e5917e51491222a853","src\/Builder\/Syntax\/MinusWriter.php":"6592cf034646815b0a4a4269a92bb264","src\/Builder\/Syntax\/UpdateWriter.php":"363315cacca607de0ea2cfd3345afa7f","src\/Builder\/Syntax\/UnionWriter.php":"8ea4f0f19bb82f370d23e4fd77a3d927","src\/Builder\/Syntax\/WhereWriter.php":"85a3a08a2cc6247313afaa9be118a452","src\/Builder\/Syntax\/PlaceholderWriter.php":"2cedd20e630d6325f7a8f39730c33fca","src\/Builder\/Syntax\/DeleteWriter.php":"b31548f5edc6f2fb11cfedacae424750","src\/Builder\/Syntax\/IntersectWriter.php":"d40b1ec3bbbab61a2dd4c87c6803cb3b","src\/Builder\/Syntax\/ColumnWriter.php":"3f3e1206ef598ea49b6d1a320214507d","src\/Builder\/Syntax\/AbstractBaseWriter.php":"47cb4e10dd1c4445e817d9bc8c25fd07","src\/Builder\/Syntax\/AbstractSetWriter.php":"cb7d03f5b59396e059fd8810e652d085","src\/Builder\/Syntax\/InsertWriter.php":"76bad325a0be45f4ad4f9684728fa380","src\/Builder\/Syntax\/UnionAllWriter.php":"422d399566ad913711dafebde7199dcb","src\/Builder\/Syntax\/WriterFactory.php":"6f45a71e3bb02a9ce78d9ec77704f9e4","src\/Builder\/Syntax\/SelectWriter.php":"352964324fc79fdc8598dccc282b9718","src\/Builder\/BuilderInterface.php":"5943c1b0ea5b6adb68df4ebefee95bdc","src\/Builder\/MySqlBuilder.php":"b054ed009a703373023f8d0d7daa6282","src\/Builder\/GenericBuilder.php":"5d45747f3b4890385a3481e8fd14c310","src\/Manipulation\/Insert.php":"8ba714b03ea21c1420137d730cb6c4c9","src\/Manipulation\/Delete.php":"054104ccfe20bf5a7ac1d273d233c99c","src\/Manipulation\/QueryFactory.php":"8ed6b07ae0ac84dba65d58c16df3ef11","src\/Manipulation\/Intersect.php":"374a1c80f144c91cc2338254f3b41614","src\/Manipulation\/AbstractSetQuery.php":"6e3ff44089b20b95674945481e36a129","src\/Manipulation\/Select.php":"508cf7e2afd7239a66686c2f478a014b","src\/Manipulation\/UnionAll.php":"1b8d33f08411b48976be1c1e11411755","src\/Manipulation\/Union.php":"58136d1ec6ae78b84c841cac36ccd338","src\/Manipulation\/ColumnQuery.php":"34f45de6502f4b9a8d3d6c2f4e64fdb5","src\/Manipulation\/AbstractBaseQuery.php":"980d6394f731bc950dc8c39345e3d906","src\/Manipulation\/QueryInterface.php":"f2b4128f6ef90c4e28042faed89bf1f9","src\/Manipulation\/AbstractCreationalQuery.php":"1658b8d9942ba753ffacea152f89a868","src\/Manipulation\/QueryException.php":"7cc36b1976e7c1f037f878d795dd6098","src\/Manipulation\/Minus.php":"3f07e6ec900568ac2713a53a64a32874","src\/Manipulation\/JoinQuery.php":"d595faaee575a2293d7fffdcfb193fb1","src\/Manipulation\/Update.php":"9829d4948e383d9cd9835d97a0088172","tests\/Syntax\/WhereTest.php":"cc88a1f11f491da77e8b1a50ae4b12e9","tests\/Syntax\/ColumnTest.php":"ed2f05bb9ac0ada2377c67da4ecde136","tests\/Syntax\/TableTest.php":"80b2af87b551c1703abfa6a1a5216471","tests\/Syntax\/OrderByTest.php":"01524ef1c6d8b6daea3f7f0d46be9031","tests\/Builder\/Syntax\/DeleteWriterTest.php":"881c1fe704a1668bbbbea379656ee586","tests\/Builder\/Syntax\/WriterFactoryTest.php":"4a21c727835342c7b11490febccd7950","tests\/Builder\/Syntax\/WhereWriterTest.php":"32f092d8dd1d88ec85f632c7cee2f01e","tests\/Builder\/Syntax\/InsertWriterTest.php":"3683eaf90f7c498d515ccc9314556b50","tests\/Builder\/Syntax\/MinusWriterTest.php":"03a125cb3e2b2a8527e681ddab7d3d22","tests\/Builder\/Syntax\/ColumnWriterTest.php":"112db4f80a2817551aec826cdf4adaf8","tests\/Builder\/Syntax\/UnionAllWriterTest.php":"0f9d105120cba52131cae421e9396a8b","tests\/Builder\/Syntax\/UnionWriterTest.php":"322c9deac401c6d69cc7c1d6dece6c74","tests\/Builder\/Syntax\/IntersectWriterTest.php":"9f3696640ac6322480e1567189aad481","tests\/Builder\/Syntax\/SelectWriterTest.php":"cd2c7ad691b9f80f0399cf07431040ec","tests\/Builder\/Syntax\/UpdateWriterTest.php":"0f05ac95a32e8162ecab36f656bc2cbf","tests\/Builder\/Syntax\/PlaceholderWriterTest.php":"b2c65b4e18951bb80d9d5eda1077f0a2","tests\/Builder\/MySqlBuilderTest.php":"a14fe861216f7375bb5ca24ce65f0764","tests\/Builder\/GenericBuilderTest.php":"4d999e49944c3a5c2f1fb3855155d394","tests\/Manipulation\/BaseQueryTest.php":"1c21822ddd3121311a65e7f8db1cd0b4","tests\/Manipulation\/MinusTest.php":"c7ea58e69b3d07eef238086e54bb9460","tests\/Manipulation\/UnionTest.php":"1556bf8671b27b2daca0dbe3bd68fa1d","tests\/Manipulation\/Resources\/DummyQuery.php":"56f44ab81db8cd5ec7071b83ea0d3602","tests\/Manipulation\/IntersectTest.php":"b3610617ffab4bf32915f51f6988fc74","tests\/Manipulation\/DeleteTest.php":"3a1b713af8d884ac58f85a6bed884fef","tests\/Manipulation\/SelectTest.php":"a2f06a85f504c5101dbf6d567636a1f7","tests\/Manipulation\/UpdateTest.php":"0d867274a32f452e05e975cc4dba6b3a","tests\/Manipulation\/UnionAllTest.php":"817e49853ba622e5cf97bf7774dacdb8","tests\/Manipulation\/QueryFactoryTest.php":"a6a4f7d41ce0b247ca9daf71d8d3faf2","tests\/Manipulation\/InsertTest.php":"d3a7272789bd390d2d00adfd47a5cbb1"}}

‎.php-cs-fixer.dist.php

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?php
2+
3+
$finder = PhpCsFixer\Finder::create()
4+
->in(__DIR__ . '/src')
5+
->in(__DIR__ . '/tests');
6+
7+
$config = new PhpCsFixer\Config();
8+
return $config->setRules([
9+
'@PSR12' => true,
10+
'strict_param' => true,
11+
'array_syntax' => ['syntax' => 'short'],
12+
'declare_strict_types' => true,
13+
])
14+
->setFinder($finder);

‎.phpunit.result.cache

Lines changed: 1 addition & 0 deletions
Large diffs are not rendered by default.

‎composer.json

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,21 @@
3232
},
3333
"require":
3434
{
35-
"php": ">=5.5",
36-
"nilportugues/sql-query-formatter": "~1.2"
35+
"php": ">=8.1",
36+
"nilportugues/sql-query-formatter": "~1.2.2"
3737
},
3838
"require-dev": {
39-
"phpunit/phpunit": "4.*",
40-
"fabpot/php-cs-fixer": "~1.9",
41-
"nilportugues/php_backslasher": "~0.2"
39+
"phpunit/phpunit": "^10.0",
40+
"phpstan/phpstan": "^2.1",
41+
"phpstan/extension-installer": "^1.4",
42+
"friendsofphp/php-cs-fixer": "^3.75"
4243
},
4344
"config":
4445
{
45-
"bin-dir": "bin"
46+
"bin-dir": "bin",
47+
"allow-plugins": {
48+
"phpstan/extension-installer": true
49+
}
4650
},
4751
"minimum-stability": "stable",
4852
"extra": {

‎composer.phar

2.98 MB
Binary file not shown.

‎phpstan.neon

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
parameters:
2+
level: 5
3+
paths:
4+
- src
5+
- tests
6+
bootstrapFiles:
7+
- vendor/autoload.php
8+
ignoreErrors:
9+
# Ignore errors related to the problematic SyntaxFactory.php if they arise
10+
- '#Access to an undefined property NilPortugues\Sql\QueryBuilder\Syntax\SyntaxFactory::\$someProperty.#'
11+
- '#Call to an undefined method NilPortugues\\Sql\\QueryBuilder\\Syntax\\SyntaxFactory::someMethod\\(\\).#'

‎src/Builder/BuilderException.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
<?php
2+
3+
declare(strict_types=1);
4+
25
/**
36
* Author: Nil Portugués Calderó <contact@nilportugues.com>
47
* Date: 6/3/14

‎src/Builder/BuilderInterface.php

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
<?php
2+
3+
declare(strict_types=1);
4+
25
/**
36
* Author: Nil Portugués Calderó <contact@nilportugues.com>
47
* Date: 6/3/14
@@ -17,17 +20,9 @@
1720
*/
1821
interface BuilderInterface
1922
{
20-
/**
21-
* @param QueryInterface $query
22-
*
23-
* @return string
24-
*/
25-
public function write(QueryInterface $query);
23+
public function write(QueryInterface $query): string;
24+
25+
public function writeFormatted(QueryInterface $query): string;
2626

27-
/**
28-
* @param QueryInterface $query
29-
*
30-
* @return string
31-
*/
32-
public function writeFormatted(QueryInterface $query);
27+
public function writeColumnAlias(string $alias): string;
3328
}

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /