Merge pull request #4 from SoftwarePunt/php81

PHP 8.1

Author: roydejong

README.md

@@ -6,9 +6,9 @@
 
 **⚠ `php-activerecord` is no longer actively being maintained, the original site is dead, and the project is mostly abandoned.**
 
-I would not recommend this ORM for any new projects or developments.
+I would ___not___ recommend this ORM for any new projects or developments.
 
-This fork contains some quality-of-life enhancements and fixes that are relevant to us and some of our older projects.
+This fork contains some quality-of-life enhancements, support for the latest PHP version, and fixes, which are relevant to us and some of our older projects that we maintain.
 
 ## Installation
 
@@ -27,9 +27,11 @@ Because we do not actively maintain tags or versions for this project, you shoul
 
 ## Fork changes
 
+**This fork is currently only compatible with PHP 8.1!**
+
 ### Fixes
 
-- Compatibility with PHP 7.2+ (DateTime) and PHP 8.0+ (fix deprecated behavior).
+- Compatibility fixes over time for PHP 7.2, 8.0, 8.1
 - `activerecord_autoload` no longer causes conflicts when the library is loaded more than once.
 - Fix `count(): Parameter must be an array or an object that implements Countable` error in `find_by_pk()`.
 - Fix `castIntegerSafely()` throwing an error if the input is empty (e.g. empty string), now just returns zero.

composer.json

@@ -15,9 +15,9 @@
       "php-activerecord/php-activerecord": "*"
     },
     "require-dev": {
-        "phpunit/phpunit": "4.*",
         "pear/pear_exception": "1.0-beta1",
-        "pear/log": "~1.12"
+        "pear/log": "~1.12",
+        "phpunit/phpunit": "^9.5"
     },
     "autoload": {
         "files": [ "ActiveRecord.php" ]

lib/Connection.php

@@ -528,7 +528,7 @@ public function string_to_datetime($string)
 		$date = date_create($string);
 		$errors = \DateTime::getLastErrors();
 
-		if ($errors['warning_count'] > 0 || $errors['error_count'] > 0)
+		if ($errors !== false && ($errors['warning_count'] > 0 || $errors['error_count'] > 0))
 			return null;
 
 		$date_class = Config::instance()->get_date_class();

lib/DateTime.php

@@ -2,6 +2,7 @@
 /**
  * @package ActiveRecord
  */
+
 namespace ActiveRecord;
 
 /**
@@ -44,169 +45,156 @@ class DateTime extends \DateTime implements DateTimeInterface, \JsonSerializable
 	 * Pre-defined format strings.
 	 */
 	public static $FORMATS = array(
-		'db'      => 'Y-m-d H:i:s',
-		'number'  => 'YmdHis',
-		'time'    => 'H:i',
-		'short'   => 'd M H:i',
-		'long'    => 'F d, Y H:i',
-		'atom'    => \DateTime::ATOM,
-		'cookie'  => \DateTime::COOKIE,
+		'db' => 'Y-m-d H:i:s',
+		'number' => 'YmdHis',
+		'time' => 'H:i',
+		'short' => 'd M H:i',
+		'long' => 'F d, Y H:i',
+		'atom' => \DateTime::ATOM,
+		'cookie' => \DateTime::COOKIE,
 		'iso8601' => \DateTime::ISO8601,
-		'rfc822'  => \DateTime::RFC822,
-		'rfc850'  => \DateTime::RFC850,
+		'rfc822' => \DateTime::RFC822,
+		'rfc850' => \DateTime::RFC850,
 		'rfc1036' => \DateTime::RFC1036,
 		'rfc1123' => \DateTime::RFC1123,
 		'rfc2822' => \DateTime::RFC2822,
 		'rfc3339' => \DateTime::RFC3339,
-		'rss'     => \DateTime::RSS,
-		'w3c'     => \DateTime::W3C);
+		'rss' => \DateTime::RSS,
+		'w3c' => \DateTime::W3C);
 
 	private $model;
 	private $attribute_name;
 
-	public function attribute_of($model, $attribute_name)
-	{
-		$this->model = $model;
-		$this->attribute_name = $attribute_name;
-	}
+	// -----------------------------------------------------------------------------------------------------------------
+	// Implementation overrides
 
-	/**
-	 * Formats the DateTime to the specified format.
-	 *
-	 * <code>
-	 * $datetime->format();         # uses the format defined in DateTime::$DEFAULT_FORMAT
-	 * $datetime->format('short');  # d M H:i
-	 * $datetime->format('Y-m-d');  # Y-m-d
-	 * </code>
-	 *
-	 * @see FORMATS
-	 * @see get_format
-	 * @param string $format A format string accepted by get_format()
-	 * @return string formatted date and time string
-	 */
-	public function format($format=null)
+	public function add($interval): \DateTime
 	{
-		return parent::format(self::get_format($format));
+		$this->flag_dirty();
+		return parent::add($interval);
 	}
 
-	/**
-	 * Returns the format string.
-	 *
-	 * If $format is a pre-defined format in $FORMATS it will return that otherwise
-	 * it will assume $format is a format string itself.
-	 *
-	 * @see FORMATS
-	 * @param string $format A pre-defined string format or a raw format string
-	 * @return string a format string
-	 */
-	public static function get_format($format=null)
-	{
-		// use default format if no format specified
-		if (!$format)
-			$format = self::$DEFAULT_FORMAT;
-
-		// format is a friendly
-		if (array_key_exists($format, self::$FORMATS))
-			 return self::$FORMATS[$format];
-
-		// raw format
-		return $format;
-	}
-
-	/**
-	 * This needs to be overriden so it returns an instance of this class instead of PHP's \DateTime.
-	 * See http://php.net/manual/en/datetime.createfromformat.php
-	 */
-	public static function createFromFormat($format, $time, $tz = null)
+	public static function createFromFormat($format, $time, $tz = null): \DateTime|false
 	{
 		$phpDate = $tz ? parent::createFromFormat($format, $time, $tz) : parent::createFromFormat($format, $time);
 		if (!$phpDate)
 			return false;
 		// convert to this class using the timestamp
-		$ourDate = new static(null, $phpDate->getTimezone());
+		$ourDate = new static('', $phpDate->getTimezone());
 		$ourDate->setTimestamp($phpDate->getTimestamp());
 		return $ourDate;
 	}
 
-	/**
-	 * @inheritDoc
-	 */
-	public function jsonSerialize()
-	{
-		return $this->format("c");
-	}
+	// createFromImmutable
 
-	public function __toString()
-	{
-		return $this->format();
-	}
+	// createFromInterface
 
-	/**
-	 * Handle PHP object `clone`.
-	 *
-	 * This makes sure that the object doesn't still flag an attached model as
-	 * dirty after cloning the DateTime object and making modifications to it.
-	 *
-	 * @return void
-	 */
-	public function __clone()
-	{
-		$this->model = null;
-		$this->attribute_name = null;
-	}
+	// getLastErrors
 
-	private function flag_dirty()
+	public function modify($modify): \DateTime
 	{
-		if ($this->model)
-			$this->model->flag_dirty($this->attribute_name);
+		$this->flag_dirty();
+		return parent::modify($modify);
 	}
 
-	public function setDate($year, $month, $day)
+	// __set_state
+
+	public function setDate($year, $month, $day): \DateTime
 	{
 		$this->flag_dirty();
 		return parent::setDate($year, $month, $day);
 	}
 
-	public function setISODate($year, $week , $day = 1)
+	public function setISODate($year, $week, $day = 1): \DateTime
 	{
 		$this->flag_dirty();
 		return parent::setISODate($year, $week, $day);
 	}
 
-	public function setTime($hour, $minute, $second = NULL, $microseconds = NULL)
+	public function setTime($hour, $minute, $second = NULL, $microseconds = NULL): \DateTime
 	{
 		$this->flag_dirty();
 		return parent::setTime($hour, $minute, $second, $microseconds);
 	}
 
-	public function setTimestamp($unixtimestamp)
+	public function setTimestamp($unixtimestamp): \DateTime
 	{
 		$this->flag_dirty();
 		return parent::setTimestamp($unixtimestamp);
 	}
 
-	public function setTimezone($timezone)
+	public function setTimezone($timezone): \DateTime
 	{
 		$this->flag_dirty();
 		return parent::setTimezone($timezone);
 	}
 
-	public function modify($modify)
+	public function sub($interval): \DateTime
 	{
 		$this->flag_dirty();
-		return parent::modify($modify);
+		return parent::sub($interval);
 	}
 
-	public function add($interval)
+	// diff
+
+	public function format($format = null): string
 	{
-		$this->flag_dirty();
-		return parent::add($interval);
+		return parent::format(self::get_format($format));
 	}
 
-	public function sub($interval)
+	// getOffset
+
+	// getTimestamp
+
+	// getTimezone
+
+	// __wakeUp
+
+	// -----------------------------------------------------------------------------------------------------------------
+	// Activerecord extensions
+
+	public static function get_format($format = null)
 	{
-		$this->flag_dirty();
-		return parent::sub($interval);
+		// use default format if no format specified
+		if (!$format)
+			$format = self::$DEFAULT_FORMAT;
+
+		// format is a friendly
+		if (array_key_exists($format, self::$FORMATS))
+			return self::$FORMATS[$format];
+
+		// raw format
+		return $format;
 	}
 
+	public function attribute_of($model, $attribute_name)
+	{
+		$this->model = $model;
+		$this->attribute_name = $attribute_name;
+	}
+
+	private function flag_dirty()
+	{
+		if ($this->model)
+			$this->model->flag_dirty($this->attribute_name);
+	}
+
+	public function __toString()
+	{
+		return $this->format();
+	}
+
+	public function __clone()
+	{
+		$this->model = null;
+		$this->attribute_name = null;
+	}
+
+	// -----------------------------------------------------------------------------------------------------------------
+	// JsonSerializable
+
+	public function jsonSerialize(): mixed
+	{
+		return $this->format("c");
+	}
 }

lib/SQLBuilder.php

@@ -19,9 +19,9 @@ class SQLBuilder
 	private $order;
 	private $limit;
 	private $offset;
-	private $group;
-	private $having;
-	private $update;
+	private $group = '';
+	private $having = '';
+	private $update = '';
 
 	// for where
 	private $where;
@@ -419,4 +419,4 @@ private function quoted_key_names()
 
 		return $keys;
 	}
-}
+}

lib/Validations.php

@@ -45,6 +45,7 @@ class Validations
 	private $options = array();
 	private $validators = array();
 	private $record;
+	private $klass;
 
 	private static $VALIDATION_FUNCTIONS = array(
 		'validates_presence_of',
@@ -517,7 +518,7 @@ public function validates_length_of($attrs)
 						$message = $options['message'];
 					else
 						$message = $options[$messageOptions[$range_option]];
-					
+
 
 					$message = str_replace('%d', $option, $message);
 					$attribute_value = $this->model->$attribute;
@@ -904,7 +905,7 @@ public function size()
 	 *
 	 * @return ArrayIterator
 	 */
-	public function getIterator()
+	public function getIterator(): ArrayIterator
 	{
 		return new ArrayIterator($this->full_messages());
 	}