Compare commits

..

No commits in common. "master" and "v0.2.0" have entirely different histories.

4 changed files with 22 additions and 21 deletions

View File

@ -3,10 +3,10 @@
"description": "Simple bundle for storing parameters in a database", "description": "Simple bundle for storing parameters in a database",
"type": "symfony-bundle", "type": "symfony-bundle",
"require": { "require": {
"php": "^8.1", "php": "^8.0",
"doctrine/orm": "^2.0", "doctrine/orm": "^2.0",
"symfony/form": "^5.0|^6.0|^7.0", "symfony/form": "^5.0|^6.0",
"symfony/twig-bundle": "^5.0|^6.0|^7.0" "symfony/twig-bundle": "^5.0|^6.0"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {

View File

@ -7,7 +7,7 @@ namespace Ardent\ParameterBundle\Controller;
use Ardent\ParameterBundle\Service\ParameterService; use Ardent\ParameterBundle\Service\ParameterService;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Routing\Attribute\Route; use Symfony\Component\Routing\Annotation\Route;
class ParameterController extends BaseController class ParameterController extends BaseController
{ {

View File

@ -2,23 +2,32 @@
namespace Ardent\ParameterBundle\Entity; namespace Ardent\ParameterBundle\Entity;
use Doctrine\DBAL\Types\TextType;
use Doctrine\ORM\Mapping as ORM; use Doctrine\ORM\Mapping as ORM;
use Symfony\Component\Form\Extension\Core\Type\CheckboxType; use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
use Symfony\Component\Form\Extension\Core\Type\NumberType; use Symfony\Component\Form\Extension\Core\Type\NumberType;
#[ORM\Entity()] /**
#[ORM\Table(name: 'parameter_bundle_parameters')] * @ORM\Entity
* @ORM\Table(name="parameter_bundle_parameters")
*/
class Parameter class Parameter
{ {
#[ORM\Id] /**
#[ORM\GeneratedValue] * @ORM\Id
#[ORM\Column] * @ORM\GeneratedValue(strategy="AUTO")
private ?int $id = null; * @ORM\Column(type="integer")
*/
private ?int $id;
#[ORM\Column] /**
* @ORM\Column(type="string")
*/
private ?string $name; private ?string $name;
#[ORM\Column(type: 'string')] /**
* @ORM\Column(type="string")
*/
private mixed $value; private mixed $value;
public function getId(): int public function getId(): int

View File

@ -15,8 +15,6 @@ class ParameterService
{ {
private array $config; private array $config;
private array $cache = [];
public function __construct( public function __construct(
private readonly EntityManagerInterface $em, private readonly EntityManagerInterface $em,
private readonly ParameterBagInterface $parameter, private readonly ParameterBagInterface $parameter,
@ -31,10 +29,6 @@ class ParameterService
*/ */
public function get(string $name, bool $parse = true): mixed public function get(string $name, bool $parse = true): mixed
{ {
if (array_key_exists($name, $this->cache)) {
return $this->cache[$name];
}
$split = explode('_', $name); $split = explode('_', $name);
$category = array_shift($split); $category = array_shift($split);
@ -59,8 +53,7 @@ class ParameterService
$value = $parameter->getValue(); $value = $parameter->getValue();
} }
$this->cache[$name] = Parameter::parseValue($value, $this->config[$category][$name]['type']); return Parameter::parseValue($value, $this->config[$category][$name]['type']);
return $this->cache[$name];
} else { } else {
return null; return null;
} }
@ -80,7 +73,6 @@ class ParameterService
$parameter->setValue($value); $parameter->setValue($value);
$this->em->persist($parameter); $this->em->persist($parameter);
$this->em->flush(); $this->em->flush();
$this->cache[$name] = $value;
} }
private function supplementConfig(array $rawConfig): array private function supplementConfig(array $rawConfig): array