Skip to content

Commit 67d613b

Browse files
authored
V5 Released (#70)
* Interfaces created to prepare 3.1.0 and 4.0.0 * Interfaces created to prepare 3.1.0 and 4.0.0 * Security issue in doctrine 2.8.3 * Headers updated * Removing no-more existent rule * Doctrine3 feature (#55) ## Doctrine 3 Feature * Compatibility with doctrine/orm:2.19 * Compatibility with doctrine/orm:3.1 * Compatibility tested (and currently working) with doctrine/orm:3.2.x-dev * Compatibility tested (and currently working) with doctrine/orm:4.0.x-dev * Fixing #40 * Fixing #42 * Fixing #43 * Fixing #55 ## List of commits * Composer upgrade feature (#47) * PHP-Code-sniffer upgraded * Composer upgraded (internal) * Github Actions upgraded * Using last stable version of geo-parser and wkt-parser * Using last stable version of longitude-one/wkb-parser instead of creof/wkb-parser * Upgrading to Phpunit 10 to be able to stop tests on deprecation * Fixing deprecations from geo-parser * Fixing hosts and ports * Restoring code coverage * Add pcov for code coverage * Fixing a bug * TODO check the code coverage * pcov added in PHP * Fixing directory for code coverage * Fixing directory for code coverage * PHP-CS-FIXER * Quality code steps * Deprecated method getName() removed Issue #40 fixed * Some deprecated calls removed, Deprecated File SQL Logger replaced, Unused methods removed * Ormtest split feature (#52) * Some deprecated calls removed, Deprecated File SQL Logger replaced, Unused methods removed * Logger class declared outside of OrmTestCase.php * Truncate tables before each test * Removing method * Quality code improved * Typo * Decrease OrmTestCase class complexity * Phpunit files updated * Removing 'else' expressions * Improving quality code * Test were not executed * Message fixed * Typo fixed * Class-string called without a string * MySql replaced with MySQL * All internal exceptions implements ExceptionInterface. * Fixing comment * Issue #42 fixed (#53) * test to reproduce issue added * Fixing test * Issue #42 fixed * Issue 12 (#54) * Removing travis directories and files * Creating a new composer script to create code coverage in cov format * Merging *.cov into a clover.xml file * Fixing coveralls.io * Fixing issues with doctrine/orm:3.0 * Adding "with all dependencies" option * Adding test with doctrine/orm:4.1.x-dev * Headers updated * README.md updated * Removing unused file * Code coverage improved * Issue #57 fixed (#59) * Fix comments in #43 * Fix #57 * "declare(strict_types=1)" added. * Fix CI * Fixing comment headers * Quality tools feature (#61) * Longitude-One quality tools added * Headers updated * PHP-Cs-Fixer Rules updated * Code sniffer rules updated * Ecologic feature (#63) * Ecologic feature. To avoid useless tests, the full tests are only launched when tests and quality tools are completed on stable version. * Specify return types (#56) * Return types of test methods specified * Quality-tools after merge * PHP Stan level 0 * Restore compatibility with ORM ^2.19 * Architecture updated * PHP-Stan level 2 * PHP-Stan level 3 * PHP-Stan level 4 * Fixing UnsupportedPlatform test * PHP-Stan level 5 * PHP-Stan level 6 * Fixing platform test on orm:^2.19 * PHP-Stan level 7 * PHP-Stan level 8 * PHP-Stan level 9 * Fixing warning * Issue #65 (#66) * Enhancement #65 implemented * Php-Stan check activated * Add delta because results are different between MySQL5.7 and MySQL8.0 * Return types mentioned (#67) * Return types mentioned * Unexpected file removed * Show installed libraries * Remove no-longer existing error in baseline * Remove no-longer used libraries in composer * Php-stan fix * Php-stan fix
1 parent c8499b0 commit 67d613b

File tree

335 files changed

+6975
-4492
lines changed

Some content is hidden

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

335 files changed

+6975
-4492
lines changed

.codeclimate.yml

+3
Original file line numberDiff line numberDiff line change
@@ -44,3 +44,6 @@ plugins:
4444
enabled: true
4545
phpmd:
4646
enabled: true
47+
checks:
48+
NamingShortVariable:
49+
enabled: false

.coveralls.yml

-1
This file was deleted.

.github/phpunit.mysql5.7.xml

+34-20
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,56 @@
1+
<?xml version="1.0"?>
12
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.5/phpunit.xsd"
3-
bootstrap="tests/LongitudeOne/Spatial/Tests/TestInit.php"
4-
cacheResultFile=".phpunit.cache/test-results"
5-
executionOrder="depends,defects"
6-
verbose="true">
3+
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
4+
bootstrap="tests/LongitudeOne/Spatial/Tests/TestInit.php" executionOrder="depends,defects" stopOnFailure="false"
5+
displayDetailsOnTestsThatTriggerDeprecations="true"
6+
displayDetailsOnTestsThatTriggerWarnings="true"
7+
displayDetailsOnTestsThatTriggerErrors="true"
8+
stopOnError="false" stopOnWarning="false" stopOnDefect="false" cacheDirectory=".phpunit.cache">
79
<testsuites>
810
<testsuite name="default">
911
<directory>tests/LongitudeOne/Spatial/Tests</directory>
1012
</testsuite>
1113
</testsuites>
12-
1314
<groups>
15+
<include>
16+
<group>php</group>
17+
<group>dql</group>
18+
<group>geometry</group>
19+
<group>srid</group>
20+
<group>mysql-only</group>
21+
<group>issue</group>
22+
</include>
1423
<exclude>
1524
<group>pgsql-only</group>
1625
<group>srid</group>
26+
<group>deprecation</group>
1727
</exclude>
1828
</groups>
19-
2029
<php>
2130
<var name="db_type" value="pdo_mysql"/>
22-
<!-- <var name="db_host" value="spatial-mysql5" />-->
23-
<var name="db_host" value="127.0.0.1" />
24-
<var name="db_username" value="main" />
25-
<var name="db_password" value="main" /> <!-- Change it -->
26-
<var name="db_name" value="main" />
27-
<var name="db_port" value="3357" />
28-
<!-- Execute dummy SELECT statement before each test to mark DB query log -->
29-
<var name="opt_mark_sql" value="true" />
30-
<!-- Enable SQLLoggerStack and query logging exception in tests -->
31-
<var name="opt_use_debug_stack" value="true" />
31+
<var name="db_host" value="127.0.0.1"/>
32+
<var name="db_username" value="main"/>
33+
<var name="db_password" value="main"/>
34+
<!-- Change it -->
35+
<var name="db_name" value="main"/>
36+
<var name="db_port" value="3357"/>
37+
<!-- Select timezone for log -->
38+
<var name="opt_log_timezone" value="Europe/Paris"/>
39+
<!-- Select the log level : debug to get each request, info to get each starting test and disconnection -->
40+
<var name="opt_log_level" value="critical"/>
41+
<!-- Select the directory to store the log files -->
42+
<var name="opt_log_dir" value=".phpunit.cache/logs"/>
43+
<!-- Select the log file name -->
44+
<var name="opt_log_file" value="mysql57.log"/>
3245
</php>
33-
34-
<coverage cacheDirectory=".phpunit.cache/code-coverage" processUncoveredFiles="true">
46+
<source>
3547
<include>
3648
<directory suffix=".php">lib</directory>
3749
</include>
50+
</source>
51+
<coverage includeUncoveredFiles="true" cacheDirectory=".phpunit.cache/code-coverage">
3852
<report>
39-
<clover outputFile=".phpunit.cache/clover-mysql57.xml"/>
53+
<clover outputFile=".phpunit.cache/code-coverage/clover-mysql57.xml"/>
4054
</report>
4155
</coverage>
4256
</phpunit>

.github/phpunit.mysql8.0.xml

+33-20
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,55 @@
1+
<?xml version="1.0"?>
12
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.5/phpunit.xsd"
3-
bootstrap="tests/LongitudeOne/Spatial/Tests/TestInit.php"
4-
cacheResultFile=".phpunit.cache/test-results"
5-
executionOrder="depends,defects"
6-
verbose="true">
3+
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
4+
bootstrap="tests/LongitudeOne/Spatial/Tests/TestInit.php" executionOrder="depends,defects" stopOnFailure="false"
5+
displayDetailsOnTestsThatTriggerDeprecations="true"
6+
displayDetailsOnTestsThatTriggerWarnings="true"
7+
displayDetailsOnTestsThatTriggerErrors="true"
8+
stopOnError="false" stopOnWarning="false" stopOnDefect="false" cacheDirectory=".phpunit.cache">
79
<testsuites>
810
<testsuite name="default">
911
<directory>tests/LongitudeOne/Spatial/Tests</directory>
1012
</testsuite>
1113
</testsuites>
12-
1314
<groups>
15+
<include>
16+
<group>php</group>
17+
<group>dql</group>
18+
<group>geometry</group>
19+
<group>srid</group>
20+
<group>mysql-only</group>
21+
<group>issue</group>
22+
</include>
1423
<exclude>
1524
<group>pgsql-only</group>
1625
<group>srid</group>
26+
<group>deprecation</group>
1727
</exclude>
1828
</groups>
19-
2029
<php>
2130
<var name="db_type" value="pdo_mysql"/>
22-
<!-- <var name="db_host" value="spatial-mysql5" />-->
23-
<var name="db_host" value="127.0.0.1" />
24-
<var name="db_username" value="main" />
25-
<var name="db_password" value="main" /> <!-- Change it -->
26-
<var name="db_name" value="main" />
27-
<var name="db_port" value="3380" />
28-
<!-- Execute dummy SELECT statement before each test to mark DB query log -->
29-
<var name="opt_mark_sql" value="true" />
30-
<!-- Enable SQLLoggerStack and query logging exception in tests -->
31-
<var name="opt_use_debug_stack" value="true" />
31+
<var name="db_host" value="127.0.0.1"/>
32+
<var name="db_username" value="main"/>
33+
<var name="db_password" value="main"/>
34+
<var name="db_name" value="main"/>
35+
<var name="db_port" value="3380"/>
36+
<!-- Select timezone for log -->
37+
<var name="opt_log_timezone" value="Europe/Paris"/>
38+
<!-- Select the log level : debug to get each request, info to get each starting test and disconnection -->
39+
<var name="opt_log_level" value="critical"/>
40+
<!-- Select the directory to store the log files -->
41+
<var name="opt_log_dir" value=".phpunit.cache/logs"/>
42+
<!-- Select the log file name -->
43+
<var name="opt_log_file" value="mysql80.log"/>
3244
</php>
33-
34-
<coverage cacheDirectory=".phpunit.cache/code-coverage" processUncoveredFiles="true">
45+
<source>
3546
<include>
3647
<directory suffix=".php">lib</directory>
3748
</include>
49+
</source>
50+
<coverage includeUncoveredFiles="true" cacheDirectory=".phpunit.cache/code-coverage">
3851
<report>
39-
<clover outputFile=".phpunit.cache/clover-mysql80.xml"/>
52+
<clover outputFile=".phpunit.cache/code-coverage/clover-mysql80.xml"/>
4053
</report>
4154
</coverage>
4255
</phpunit>

.github/phpunit.pgsql.xml

+38-21
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,58 @@
1+
<?xml version="1.0"?>
12
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.5/phpunit.xsd"
3-
bootstrap="tests/LongitudeOne/Spatial/Tests/TestInit.php"
4-
cacheResultFile=".phpunit.cache/test-results"
5-
executionOrder="depends,defects"
6-
verbose="true">
3+
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
4+
bootstrap="tests/LongitudeOne/Spatial/Tests/TestInit.php" executionOrder="depends,defects" stopOnFailure="false"
5+
displayDetailsOnTestsThatTriggerDeprecations="true"
6+
displayDetailsOnTestsThatTriggerWarnings="true"
7+
displayDetailsOnTestsThatTriggerErrors="true"
8+
stopOnError="false" stopOnWarning="false" stopOnDefect="false" cacheDirectory=".phpunit.cache">
79
<testsuites>
810
<testsuite name="default">
911
<directory>tests/LongitudeOne/Spatial/Tests</directory>
1012
</testsuite>
1113
</testsuites>
12-
1314
<groups>
15+
<include>
16+
<group>php</group>
17+
<group>dql</group>
18+
<group>geometry</group>
19+
<group>geography</group>
20+
<group>srid</group>
21+
<group>pgsql-only</group>
22+
<group>issue</group>
23+
</include>
1424
<exclude>
1525
<group>mysql-only</group>
1626
</exclude>
1727
</groups>
18-
1928
<php>
2029
<var name="db_type" value="pdo_pgsql"/>
21-
<!-- <var name="db_host" value="spatial-postgis" />-->
22-
<var name="db_host" value="127.0.0.1" />
23-
<var name="db_username" value="main" />
24-
<var name="db_password" value="main" /> <!-- Change it -->
25-
<var name="db_name" value="main" />
26-
<var name="db_port" value="5432" />
27-
<!-- Execute dummy SELECT statement before each test to mark DB query log -->
28-
<var name="opt_mark_sql" value="true" />
29-
<!-- Enable SQLLoggerStack and query logging exception in tests -->
30-
<var name="opt_use_debug_stack" value="true" />
31-
</php>
30+
<var name="db_host" value="127.0.0.1"/>
31+
<var name="db_username" value="main"/>
32+
<var name="db_password" value="main"/>
33+
<var name="db_name" value="main"/>
34+
<var name="db_port" value="5432"/>
35+
<!-- PostgreSQL cannot drop current database, -->
36+
<!-- Also, we connect on the alternate database, then we drop the main database -->
37+
<var name="db_alternate" value="postgres"/>
3238

33-
<coverage cacheDirectory=".phpunit.cache/code-coverage" processUncoveredFiles="true">
39+
<!-- Select timezone for log -->
40+
<var name="opt_log_timezone" value="Europe/Paris"/>
41+
<!-- Select the log level -->
42+
<var name="opt_log_level" value="debug"/>
43+
<!-- Select the directory to store the log files -->
44+
<var name="opt_log_dir" value=".phpunit.cache/logs"/>
45+
<!-- Select the log file name -->
46+
<var name="opt_log_file" value="pgsql.log"/>
47+
</php>
48+
<source>
3449
<include>
35-
<directory suffix=".php">lib</directory>
50+
<directory suffix=".php">lib/</directory>
3651
</include>
52+
</source>
53+
<coverage includeUncoveredFiles="true" cacheDirectory=".phpunit.cache/code-coverage">
3754
<report>
38-
<clover outputFile=".phpunit.cache/clover-pgsql.xml"/>
55+
<clover outputFile=".phpunit.cache/code-coverage/clover-pgsql.xml"/>
3956
</report>
4057
</coverage>
4158
</phpunit>

0 commit comments

Comments
 (0)