Add type hint, use ObjectManager

Author: jmontoyaa

spec/Manager/SettingsManagerSpec.php

@@ -11,7 +11,7 @@
 
 namespace spec\Sylius\Bundle\SettingsBundle\Manager;
 
-use Doctrine\Persistence\ObjectRepository;
+use Doctrine\Persistence\ObjectManager;
 use PhpSpec\ObjectBehavior;
 use Sylius\Bundle\SettingsBundle\Resource\FactoryInterface;
 use Sylius\Bundle\SettingsBundle\Manager\SettingsManager;
@@ -27,7 +27,7 @@ final class SettingsManagerSpec extends ObjectBehavior
     function let(
         ServiceRegistryInterface $schemaRegistry,
         ServiceRegistryInterface $resolverRegistry,
-        ObjectRepository $manager,
+        ObjectManager $manager,
         FactoryInterface $settingsFactory,
         EventDispatcherInterface $eventDispatcher
     ) {

src/Bundle/DependencyInjection/Configuration.php

@@ -44,9 +44,6 @@ public function getConfigTreeBuilder()
         return $treeBuilder;
     }
 
-    /**
-     * @param ArrayNodeDefinition $node
-     */
     private function addClassesSection(ArrayNodeDefinition $node)
     {
         $node

src/Bundle/Manager/SettingsManager.php

@@ -11,7 +11,7 @@
 
 namespace Sylius\Bundle\SettingsBundle\Manager;
 
-use Doctrine\Persistence\ObjectRepository;
+use Doctrine\Persistence\ObjectManager;
 use Sylius\Bundle\SettingsBundle\Event\SettingsEvent;
 use Sylius\Bundle\SettingsBundle\Model\SettingsInterface;
 use Sylius\Bundle\SettingsBundle\Registry\ServiceRegistryInterface;
@@ -38,7 +38,7 @@ final class SettingsManager implements SettingsManagerInterface
     private $resolverRegistry;
 
     /**
-     * @var ObjectRepository
+     * @var ObjectManager
      */
     private $manager;
 
@@ -55,7 +55,7 @@ final class SettingsManager implements SettingsManagerInterface
     public function __construct(
         ServiceRegistryInterface $schemaRegistry,
         ServiceRegistryInterface $resolverRegistry,
-        ObjectRepository $manager,
+        ObjectManager $manager,
         FactoryInterface $settingsFactory,
         EventDispatcherInterface $eventDispatcher
     ) {
@@ -69,7 +69,7 @@ public function __construct(
     /**
      * {@inheritdoc}
      */
-    public function load(string $schemaAlias, string $namespace = null, bool $ignoreUnknown = true)
+    public function load(string $schemaAlias, string $namespace = null, bool $ignoreUnknown = true): SettingsInterface
     {
         /** @var SchemaInterface $schema */
         $schema = $this->schemaRegistry->get($schemaAlias);

src/Bundle/Manager/SettingsManagerInterface.php

@@ -15,19 +15,11 @@
 
 /**
  * @author Paweł Jędrzejewski <[email protected]>
+ * @author Julio Montoya
  */
 interface SettingsManagerInterface
 {
-    /**
-     * @param string      $schemaAlias
-     * @param string|null $namespace
-     *
-     * @return SettingsInterface
-     */
-    public function load(string $schemaAlias, string $namespace = null);
+    public function load(string $schemaAlias, string $namespace = null, bool $ignoreUnknown = true): SettingsInterface;
 
-    /**
-     * @param SettingsInterface $settings
-     */
     public function save(SettingsInterface $settings);
 }

src/Bundle/Schema/SchemaInterface.php

@@ -18,13 +18,7 @@
  */
 interface SchemaInterface
 {
-    /**
-     * @param SettingsBuilderInterface $builder
-     */
     public function buildSettings(AbstractSettingsBuilder $builder);
 
-    /**
-     * @param FormBuilderInterface $builder
-     */
     public function buildForm(FormBuilderInterface $builder);
 }

src/Bundle/Templating/Helper/SettingsHelper.php

@@ -12,6 +12,7 @@
 namespace Sylius\Bundle\SettingsBundle\Templating\Helper;
 
 use Sylius\Bundle\SettingsBundle\Manager\SettingsManagerInterface;
+use Sylius\Bundle\SettingsBundle\Model\SettingsInterface;
 use Symfony\Component\Templating\Helper\Helper;
 
 final class SettingsHelper extends Helper implements SettingsHelperInterface
@@ -29,10 +30,7 @@ public function __construct(SettingsManagerInterface $settingsManager)
         $this->settingsManager = $settingsManager;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getSettings($schemaAlias)
+    public function getSettings($schemaAlias): SettingsInterface
     {
         return $this->settingsManager->load($schemaAlias);
     }

src/Bundle/Templating/Helper/SettingsHelperInterface.php

@@ -11,6 +11,7 @@
 
 namespace Sylius\Bundle\SettingsBundle\Templating\Helper;
 
+use Sylius\Bundle\SettingsBundle\Model\SettingsInterface;
 use Symfony\Component\Templating\Helper\HelperInterface;
 
 /**
@@ -20,8 +21,6 @@ interface SettingsHelperInterface extends HelperInterface
 {
     /**
      * @param string $schemaAlias
-     *
-     * @return array
      */
-    public function getSettings($schemaAlias);
+    public function getSettings($schemaAlias): SettingsInterface;
 }