compatibility with php 7.4 and 8.x (propelorm#4)

* Correct deprecated methods in PHP7.4 (propelorm#1079)

* runtime/lib/query/Join.php
  implode() was used against the definition (wrong PHP documentation

* runtime/lib/query/ModelCriteria.php
  count() was used on non-countable variable (non-array)

* 7.4 and phpunit9 changes. Tests are passing

* Compatibility changes

* Added docker setup

* updated travis

* added correct path

* 7.4 final travis setup

* propelorm#1086: Code review suggestions applying

* remove dependency on docker mysql

* remove 5.6 and 7.2 from test matrix; add 8.0 and 8.1

* Upgraded PHP version and removed some deprecations

* Migrated phpunit.xml.dist

* Switched to PHP8.0 in Dockerfile

* Removed usage of ReflectionClass->getClass in favor of ReflectionClass->getType

* Changed order of arguments in ModelCriteriaTest.php and ModelCriteriaWithNamespaceTest.php

* Fixed signatures of PropelOnDemandCollection::asort and PropelOnDemandCollection::ksort

* Removed require_once from all the classes because we have autoloading via composer

* Rector automated upgrade to PHP8

* Fixed invalid handling of resource type for binded value in DebugPDOStatement.php

* Fixed invalid way of checking if method exists in delegated class via is_callable. Switched to method_exists

* Replaced order of params because of failed tests

* [STYLE]: Added simplified usage because of version support dropping

* Fix use of abs() with string on PHP8.0

Can happen when using Yaml's multiline syntax

* specify minimum version of phing for php8

* drop php 7.3 from test matrix

* update to ubuntu-20.04

* fork propel/propel1 for versions >=1.8

Co-authored-by: Michal Drozd <[email protected]>
Co-authored-by: Luke Adamczewski <[email protected]>
Co-authored-by: Łukasz Adamczewski <[email protected]>
Co-authored-by: Jeffrey Wong <[email protected]>
Co-authored-by: Luke Adamczewski <[email protected]>
Co-authored-by: Paulo Magalhaes <[email protected]>

Author: 4 people

.github/workflows/test.yml

@@ -8,17 +8,14 @@ jobs:
         env:
             DB: mysql
             DB_USER: root
-        runs-on: ubuntu-18.04
+        runs-on: ubuntu-20.04
         strategy:
             fail-fast: false
             matrix:
                 php:
-                    - '5.6'
-                    - '7.2'
-                    - '7.3'
                     - '7.4'
-#                    - '8.0'
-#                    - '8.1'
+                    - '8.0'
+                    - '8.1'
                 composer:
                     - ''
                     - '--prefer-lowest'

composer.json

@@ -1,5 +1,5 @@
 {
-  "name": "propel/propel1",
+  "name": "dayspring-tech/propel1",
   "description": "Propel is an open-source Object-Relational Mapping (ORM) for PHP5.",
   "keywords": ["orm", "active record", "mapping", "database", "persistence"],
   "homepage": "http://www.propelorm.org/",
@@ -14,6 +14,7 @@
   },
   "include-path": ["runtime/lib", "generator/lib"],
   "require": {
+<<<<<<< HEAD
     "php": "^7.1",
     "phing/phing": "~2.4"
 
@@ -23,18 +24,31 @@
     "phpunit/phpunit": "^9.0.0",
     "phpcompatibility/php-compatibility": "^9.3",
     "squizlabs/php_codesniffer": "^3.5"
+=======
+    "php": "^8.0|^7.4",
+    "phing/phing": "^2.17",
+    "ext-pdo": "*"
   },
-  "extra": {
-    "branch-alias": {
-      "dev-master": "1.7-dev"
-    }
+  "require-dev": {
+    "phpunit/phpunit": "^9.0.0",
+    "phpcompatibility/php-compatibility": "^9.3",
+    "squizlabs/php_codesniffer": "^3.5",
+    "ext-simplexml": "*",
+    "ext-dom": "*"
+>>>>>>> 73148f83 (compatibility with php 7.4 and 8.x (#4))
+  },
+  "replace": {
+    "propel/propel1": "^1.8"
   },
+<<<<<<< HEAD
   "repositories": [
     {
       "type": "pear",
       "url": "https://pear.php.net"
     }
   ],
+=======
+>>>>>>> 73148f83 (compatibility with php 7.4 and 8.x (#4))
   "bin": ["generator/bin/propel-gen", "generator/bin/propel-gen.bat"],
   "scripts": {
     "post-install-cmd": "\"vendor/bin/phpcs\" --config-set installed_paths vendor/phpcompatibility/php-compatibility",

docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM thecodingmachine/php:7.4-v3-cli
+FROM thecodingmachine/php:8.0-v4-cli
 USER root
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y locales
 

docker/docker-compose.yml

@@ -9,9 +9,18 @@ services:
     volumes:
       - ../:/usr/src/app
     environment:
+<<<<<<< HEAD
       - PHP_EXTENSIONS=intl pdo_sqlite sqlite3
       - STARTUP_COMMAND_1=composer install
       - STARTUP_COMMAND_2=bash test/reset_tests.sh
+=======
+      - PHP_EXTENSIONS=intl pdo_sqlite sqlite3 xdebug
+      - STARTUP_COMMAND_1=composer install
+      - STARTUP_COMMAND_2=bash test/reset_tests.sh
+      - PHP_IDE_CONFIG="serverName=propel"
+      - XDEBUG_MODE=debug
+      - XDEBUG_SESSION=1
+>>>>>>> 73148f83 (compatibility with php 7.4 and 8.x (#4))
 
   db:
     image: percona

generator/lib/behavior/DelegateBehavior.php

@@ -111,7 +111,7 @@ public function objectCall($builder)
                 $relationName = $builder->getFKPhpNameAffix($fk);
             }
             $script .= "
-if (is_callable(array('$ARFQCN', \$name))) {
+if (method_exists('$ARFQCN', \$name)) {
     if (!\$delegate = \$this->get$relationName()) {
         \$delegate = new $ARClassName();
         \$this->set$relationName(\$delegate);

generator/lib/behavior/aggregate_column/AggregateColumnBehavior.php

@@ -8,8 +8,6 @@
  * @license    MIT License
  */
 
-require_once 'AggregateColumnRelationBehavior.php';
-
 /**
  * Keeps an aggregate column updated with related table
  *

generator/lib/behavior/aggregate_column/AggregateColumnRelationBehavior.php

@@ -8,8 +8,6 @@
  * @license    MIT License
  */
 
-require_once 'AggregateColumnRelationBehavior.php';
-
 /**
  * Keeps an aggregate column updated with related table
  *

generator/lib/behavior/aggregate_column/templates/objectCompute.php

@@ -1,4 +1,3 @@
-
 /**
  * Computes the value of the aggregate column <?php echo $column->getName() ?>
  *

generator/lib/behavior/aggregate_column/templates/objectUpdate.php

@@ -1,4 +1,3 @@
-
 /**
  * Updates the aggregate column <?php echo $column->getName() ?>
  *

generator/lib/behavior/aggregate_column/templates/objectUpdateRelated.php

@@ -1,4 +1,3 @@
-
 /**
  * Update the aggregate column in the related <?php echo $relationName ?> object
  *