Merge pull request #1 from friendica/develop

[friendica.git] / src / Core / Cache / TraitMemcacheCommand.php

diff --git a/src/Core/Cache/TraitMemcacheCommand.php b/src/Core/Cache/TraitMemcacheCommand.php
index 2b136621e59aac084f59fb092f12766bd2bc1f29..bec27e33810840995049c30a8aa3df22d42d9977 100644 (file)
--- a/src/Core/Cache/TraitMemcacheCommand.php
+++ b/src/Core/Cache/TraitMemcacheCommand.php
@@ -1,4 +1,23 @@
 <?php
+/**
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
 
 namespace Friendica\Core\Cache;
 
@@ -44,16 +63,14 @@ trait TraitMemcacheCommand
 
                foreach ($lines as $line) {
 
-                       if (preg_match("/STAT items:([\d]+):number ([\d]+)/", $line, $matches)) {
+                       if (preg_match("/STAT items:([\d]+):number ([\d]+)/", $line, $matches) &&
+                           isset($matches[1]) &&
+                           !in_array($matches[1], $keys)) {
 
-                               if (isset($matches[1])) {
-                                       if (!in_array($matches[1], $keys)) {
-                                               $slabs[] = $matches[1];
-                                               $string  = $this->sendMemcacheCommand("stats cachedump " . $matches[1] . " " . $matches[2]);
-                                               preg_match_all("/ITEM (.*?) /", $string, $matches);
-                                               $keys = array_merge($keys, $matches[1]);
-                                       }
-                               }
+                               $slabs[] = $matches[1];
+                               $string  = $this->sendMemcacheCommand("stats cachedump " . $matches[1] . " " . $matches[2]);
+                               preg_match_all("/ITEM (.*?) /", $string, $matches);
+                               $keys = array_merge($keys, $matches[1]);
                        }
                }
 
@@ -83,7 +100,7 @@ trait TraitMemcacheCommand
                fwrite($s, $command . "\r\n");
                $buf = '';
 
-               while ((!feof($s))) {
+               while (!feof($s)) {
 
                        $buf .= fgets($s, 256);