Merge pull request #1947 from propelorm/fixes-date

Fix up datetime PHPStan error.
propelorm · Jan 23, 2023 · 5aec365 · 5aec365
2 parents de6deb4 + 531dd64
commit 5aec365
Show file tree

Hide file tree

Showing 7 changed files with 51 additions and 23 deletions.
diff --git a/src/Propel/Common/Config/XmlToArrayConverter.php b/src/Propel/Common/Config/XmlToArrayConverter.php
@@ -62,7 +62,7 @@ public static function convert(string $xmlToParse): array
         libxml_clear_errors();
         libxml_use_internal_errors($currentInternalErrors);
 
-        if (count($errors) > 0) {
+        if ($xml === false || count($errors) > 0) {
             throw new XmlParseException($errors);
         }
 

diff --git a/src/Propel/Generator/Behavior/Delegate/DelegateBehavior.php b/src/Propel/Generator/Behavior/Delegate/DelegateBehavior.php
@@ -193,7 +193,7 @@ public function objectCall(ObjectBuilder $builder): string
     public function objectFilter(string &$script): void
     {
         $p = new PhpParser($script, true);
-        $text = $p->findMethod('toArray');
+        $text = (string)$p->findMethod('toArray');
         $matches = [];
         preg_match('/(\$result = \[([^;]+)\];)/U', $text, $matches);
         if (!$matches) {

diff --git a/src/Propel/Generator/Behavior/Sortable/SortableBehaviorObjectBuilderModifier.php b/src/Propel/Generator/Behavior/Sortable/SortableBehaviorObjectBuilderModifier.php
@@ -289,6 +289,7 @@ public function objectFilter(string &$script, AbstractOMBuilder $builder): void
                     $script = str_replace($search, $replace, $script);
                 }
             } else {
+                /** @var string $scope */
                 $scope = current($this->behavior->getScopes());
                 $name = strtolower($this->behavior->getTable()->getColumn($scope)->getName());
 

diff --git a/src/Propel/Generator/Behavior/Sortable/SortableBehaviorQueryBuilderModifier.php b/src/Propel/Generator/Behavior/Sortable/SortableBehaviorQueryBuilderModifier.php
@@ -166,8 +166,10 @@ static public function sortableApplyScopeCriteria(Criteria \$criteria, \$scope,
 ";
             }
         } else {
+            /** @var string $scope */
+            $scope = current($this->behavior->getScopes());
             $script .= "
-    \$criteria->\$method({$this->tableMapClassName}::" . Column::CONSTANT_PREFIX . strtoupper(current($this->behavior->getScopes())) . ", \$scope, Criteria::EQUAL);
+    \$criteria->\$method({$this->tableMapClassName}::" . Column::CONSTANT_PREFIX . strtoupper($scope) . ", \$scope, Criteria::EQUAL);
 ";
         }
 

diff --git a/src/Propel/Generator/Builder/Om/TableMapLoaderScriptBuilder.php b/src/Propel/Generator/Builder/Om/TableMapLoaderScriptBuilder.php
@@ -121,13 +121,14 @@ protected function sortRecursive(array &$array): void
     /**
      * @param \Propel\Generator\Model\Table $table
      *
-     * @return string
+     * @return class-string<\Propel\Runtime\Map\TableMap>
      */
     protected function getFullyQualifiedTableMapClassName(Table $table): string
     {
         $builder = new TableMapBuilder($table);
         $builder->setGeneratorConfig($this->generatorConfig);
 
+        /** @var class-string<\Propel\Runtime\Map\TableMap> */
         return $builder->getFullyQualifiedClassName();
     }
 

diff --git a/src/Propel/Runtime/DataFetcher/AbstractDataFetcher.php b/src/Propel/Runtime/DataFetcher/AbstractDataFetcher.php
@@ -49,6 +49,7 @@ public function getDataObject()
      */
     public function fetchColumn($index = null)
     {
+        /** @var array|null $next */
         $next = $this->fetch();
 
         if (!$next) {

diff --git a/src/Propel/Runtime/Util/PropelDateTime.php b/src/Propel/Runtime/Util/PropelDateTime.php
@@ -121,28 +121,51 @@ public static function newInstance($value, ?DateTimeZone $timeZone = null, strin
             // because DateTime('') == DateTime('now') -- which is unexpected
             return null;
         }
+
         try {
-            if (static::isTimestamp($value)) { // if it's a unix timestamp
-                $format = 'U';
-                if (strpos($value, '.')) {
-                    //with milliseconds
-                    $format = 'U.u';
-                }
-
-                $dateTimeObject = DateTime::createFromFormat($format, $value, new DateTimeZone('UTC'));
-                // timezone must be explicitly specified and then changed
-                // because of a DateTime bug: http://bugs.php.net/bug.php?id=43003
-                $dateTimeObject->setTimeZone(new DateTimeZone(date_default_timezone_get()));
+            $dateTimeObject = static::createDateTime($value, $timeZone, $dateTimeClass);
+        } catch (Exception $e) {
+            $value = var_export($value, true);
+
+            throw new PropelException('Error parsing date/time value `' . $value . '`: ' . $e->getMessage(), 0, $e);
+        }
+
+        return $dateTimeObject;
+    }
+
+    /**
+     * @param mixed $value
+     * @param \DateTimeZone|null $timeZone
+     * @param string $dateTimeClass
+     *
+     * @throws \Exception
+     *
+     * @return mixed
+     */
+    protected static function createDateTime($value, ?DateTimeZone $timeZone = null, string $dateTimeClass = 'DateTime')
+    {
+        if (static::isTimestamp($value)) { // if it's a unix timestamp
+            $format = 'U';
+            if (strpos($value, '.')) {
+                //with milliseconds
+                $format = 'U.u';
+            }
+
+            $dateTimeObject = DateTime::createFromFormat($format, $value, new DateTimeZone('UTC'));
+            if ($dateTimeObject === false) {
+                throw new Exception(sprintf('Cannot create DateTime from format `%s`', $format));
+            }
+
+            // timezone must be explicitly specified and then changed
+            // because of a DateTime bug: http://bugs.php.net/bug.php?id=43003
+            $dateTimeObject->setTimeZone(new DateTimeZone(date_default_timezone_get()));
+        } else {
+            if ($timeZone === null) {
+                // stupid DateTime constructor signature
+                $dateTimeObject = new $dateTimeClass($value);
             } else {
-                if ($timeZone === null) {
-                    // stupid DateTime constructor signature
-                    $dateTimeObject = new $dateTimeClass($value);
-                } else {
-                    $dateTimeObject = new $dateTimeClass($value, $timeZone);
-                }
+                $dateTimeObject = new $dateTimeClass($value, $timeZone);
             }
-        } catch (Exception $e) {
-            throw new PropelException('Error parsing date/time value: ' . var_export($value, true), 0, $e);
         }
 
         return $dateTimeObject;