code refactor

phpmob · Dec 26, 2017 · 12eef9f · 12eef9f
1 parent 1e33cd7
commit 12eef9f
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 18 deletions.
diff --git a/Manager/CachedManager.php b/Manager/CachedManager.php
@@ -49,7 +49,7 @@ public function __construct(SettingManagerInterface $manager, CacheItemPoolInter
      *
      * @return string
      */
-    private function getCacheKey($section, $key, ?string $owner)
+    private function getCacheKey($section, $key, ?string $owner = null)
     {
         return 'phpmob-settings.' . ($owner
                 ? sprintf('%s.%s.%s', $section, $key, $owner)
@@ -60,7 +60,7 @@ private function getCacheKey($section, $key, ?string $owner)
     /**
      * {@inheritdoc}
      */
-    public function setSetting(string $section, string $key, $value, ?string $owner, $autoFlush = false): void
+    public function setSetting(string $section, string $key, $value, ?string $owner = null, $autoFlush = false): void
     {
         $cacheKey = $this->getCacheKey($section, $key, $owner);
 
@@ -78,7 +78,7 @@ public function setSetting(string $section, string $key, $value, ?string $owner,
     /**
      * {@inheritdoc}
      */
-    public function getSetting(string $section, string $key, ?string $owner)
+    public function getSetting(string $section, string $key, ?string $owner = null)
     {
         $cacheKey = $this->getCacheKey($section, $key, $owner);
 
@@ -106,19 +106,19 @@ public function flush(): void
     /**
      * {@inheritdoc}
      */
-    public function get(string $path, ?string $owner)
+    public function get(string $path, ?string $owner = null)
     {
-        [$section, $key] = explode('.', $path);
+        @list($section, $key) = explode('.', $path);
 
         return $this->getSetting($section, $key, $owner);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function set(string $path, $value, ?string $owner): void
+    public function set(string $path, $value, ?string $owner = null): void
     {
-        [$section, $key] = explode('.', $path);
+        @list($section, $key) = explode('.', $path);
 
         $this->setSetting($section, $key, $value, $owner, true);
     }

diff --git a/Manager/SettingManager.php b/Manager/SettingManager.php
@@ -154,7 +154,7 @@ private function assertSectionScope($section, ?string $owner)
     /**
      * {@inheritdoc}
      */
-    public function setSetting(string $section, string $key, $value, ?string $owner, $autoFlush = false): void
+    public function setSetting(string $section, string $key, $value, ?string $owner = null, $autoFlush = false): void
     {
         $this->assertSectionScope($section, $owner);
 
@@ -174,7 +174,7 @@ public function setSetting(string $section, string $key, $value, ?string $owner,
     /**
      * {@inheritdoc}
      */
-    public function getSetting(string $section, string $key, ?string $owner)
+    public function getSetting(string $section, string $key, ?string $owner = null)
     {
         $this->assertSectionScope($section, $owner);
 
@@ -205,12 +205,12 @@ public function flush(): void
     /**
      * {@inheritdoc}
      */
-    public function get(string $path, ?string $owner)
+    public function get(string $path, ?string $owner = null)
     {
-        @[$section, $key] = explode('.', $path);
+        @list($section, $key) = explode('.', $path);
 
         if (empty($key)) {
-            throw new \InvalidArgumentException("The $path should be something like: `section.key`.");
+            return null;
         }
 
         return $this->getSetting($section, $key, $owner);
@@ -219,9 +219,9 @@ public function get(string $path, ?string $owner)
     /**
      * {@inheritdoc}
      */
-    public function set(string $path, $value, ?string $owner): void
+    public function set(string $path, $value, ?string $owner = null): void
     {
-        @[$section, $key] = explode('.', $path);
+        @list($section, $key) = explode('.', $path);
 
         if (empty($key)) {
             throw new \InvalidArgumentException("The $path should be something like: `section.key`.");

diff --git a/Manager/SettingManagerInterface.php b/Manager/SettingManagerInterface.php
@@ -25,7 +25,7 @@ interface SettingManagerInterface
      * @param string|null $owner
      * @param bool $autoFlush
      */
-    public function setSetting(string $section, string $key, $value, ?string $owner, $autoFlush = false): void;
+    public function setSetting(string $section, string $key, $value, ?string $owner = null, $autoFlush = false): void;
 
     /**
      * @param string $section
@@ -34,22 +34,22 @@ public function setSetting(string $section, string $key, $value, ?string $owner,
      *
      * @return mixed
      */
-    public function getSetting(string $section, string $key, ?string $owner);
+    public function getSetting(string $section, string $key, ?string $owner = null);
 
     /**
      * @param string $path
      * @param string|null $owner
      *
      * @return mixed
      */
-    public function get(string $path, ?string $owner);
+    public function get(string $path, ?string $owner = null);
 
     /**
      * @param string $path
      * @param $value
      * @param string|null $owner
      */
-    public function set(string $path, $value, ?string $owner): void;
+    public function set(string $path, $value, ?string $owner = null): void;
 
     /**
      * Flush