Added support for php8 removing package from project. This package is no longer needed, its functionality has been replaced by native php code.

Author: lmss

CHANGELOG.md

@@ -4,9 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
-## [2.1.6] - 2019-10-04
+## [3.0.0] - 2022-11-23
+### Added
+ - Added support for php8 removing package `fleshgrinder/format` from project. This package is no longer needed, its functionality has been replaced by native php code.
 ### Fixed
- - Changed validation to check if empty instead of null.
+ - Fixed Twig class paths
 
 ## [2.1.5] - 2019-10-04
 ### Fixed

composer.json

@@ -19,7 +19,6 @@
   },
   "require": {
     "php": ">=7.0.0",
-    "fleshgrinder/format": "^1.1",
     "twig/twig": ">=1.35"
   },
   "require-dev": {

src/Messages.php

@@ -4,8 +4,6 @@
 */
 namespace PHPForm;
 
-use Fleshgrinder\Core\Formatter;
-
 class Messages
 {
     /**
@@ -48,7 +46,9 @@ public static function format(string $id, array $context = null)
         $message = array_key_exists($id, self::$messages) ? self::$messages[$id] : $id;
 
         if (!is_null($context)) {
-            $message = Formatter::format($message, $context);
+            foreach ($context as $key => $value) {
+                $message = str_replace("{{$key}}", $value, $message);
+            }
         }
 
         return $message;

src/Renderers/TwigRenderer.php

@@ -5,9 +5,6 @@
 namespace PHPForm\Renderers;
 
 use Twig\Loader\ChainLoader;
-use Twig\Environment;
-use Twig\Loader\FilesystemLoader;
-use Twig\TwigFilter;
 
 class TwigRenderer implements Renderer
 {
@@ -32,8 +29,8 @@ public function __construct(array $templates_dirs, array $options = array())
             $class = 'Twig_Loader_Filesystem';
             $envClass = 'Twig_Environment';
         } else {
-            $class = 'FilesystemLoader';
-            $envClass = 'Environment';
+            $class = 'Twig\Loader\FilesystemLoader';
+            $envClass = 'Twig\Environment';
         }
 
         foreach ($templates_dirs as $template_dir) {
@@ -50,7 +47,7 @@ public function setFilters()
         if (class_exists('Twig_SimpleFilter')) {
             $class = 'Twig_SimpleFilter';
         } else {
-            $class = 'TwigFilter';
+            $class = 'Twig\TwigFilter';
         }
 
         $filter_merge_str = new $class('merge_str', function ($attrs, array $options = array()) {

tests/unit/MessagesTest.php

@@ -23,6 +23,10 @@ public function testFormat()
     public function testFormatWithContext()
     {
         $this->assertEquals("String unit", Messages::format("String {name}", ["name" => "unit"]));
+        $this->assertEquals(
+            "String unit test",
+            Messages::format("String {name} {test}", ["name" => "unit", "test" => "test"])
+        );
         $this->assertEquals(
             "Ensure this value is greater than or equal to 10.",
             Messages::format("INVALID_MIN_VALUE", ["limit" => 10])