updated tool for annotation updating

.gitignore

@@ -3,3 +3,4 @@
 vendor/
 test.php
 composer.lock
+tools/back/

phpunit.xml

@@ -19,5 +19,10 @@
     beStrictAboutOutputDuringTests      = "true"
     beStrictAboutTestSize               = "true"
 >
+    <testsuites>
+        <testsuite name="All tests">
+            <directory suffix="Test.php" >./tests/</directory>
+        </testsuite>
+    </testsuites>
 
 </phpunit>

src/RedisClient/Client/Version/RedisClient2x6.php

@@ -11,23 +11,23 @@
 namespace RedisClient\Client\Version;
 
 use RedisClient\Client\AbstractRedisClient;
-use RedisClient\Command\Traits\Version3x2\CommandsTrait;
+use RedisClient\Command\Traits\Version2x6\CommandsTrait;
 use RedisClient\Pipeline\PipelineInterface;
-use RedisClient\Pipeline\Version\Pipeline3x2;
+use RedisClient\Pipeline\Version\Pipeline2x6;
 
 /**
  * Class RedisClient
  * @package RedisClient
  */
-class RedisClient3x2 extends AbstractRedisClient {
+class RedisClient2x6 extends AbstractRedisClient {
     use CommandsTrait;
 
     /**
      * @param \Closure|null $Pipeline
      * @return PipelineInterface
      */
     protected function createPipeline(\Closure $Pipeline = null) {
-        return new Pipeline3x2($Pipeline);
+        return new Pipeline2x6($Pipeline);
     }
 
 }

src/RedisClient/Client/Version/RedisClient2x8.php

@@ -11,23 +11,23 @@
 namespace RedisClient\Client\Version;
 
 use RedisClient\Client\AbstractRedisClient;
-use RedisClient\Command\Traits\Version3x2\CommandsTrait;
+use RedisClient\Command\Traits\Version2x8\CommandsTrait;
 use RedisClient\Pipeline\PipelineInterface;
-use RedisClient\Pipeline\Version\Pipeline3x2;
+use RedisClient\Pipeline\Version\Pipeline2x8;
 
 /**
  * Class RedisClient
  * @package RedisClient
  */
-class RedisClient3x2 extends AbstractRedisClient {
+class RedisClient2x8 extends AbstractRedisClient {
     use CommandsTrait;
 
     /**
      * @param \Closure|null $Pipeline
      * @return PipelineInterface
      */
     protected function createPipeline(\Closure $Pipeline = null) {
-        return new Pipeline3x2($Pipeline);
+        return new Pipeline2x8($Pipeline);
     }
 
 }

src/RedisClient/Client/Version/RedisClient2x9.php

@@ -11,23 +11,23 @@
 namespace RedisClient\Client\Version;
 
 use RedisClient\Client\AbstractRedisClient;
-use RedisClient\Command\Traits\Version3x2\CommandsTrait;
+use RedisClient\Command\Traits\Version2x9\CommandsTrait;
 use RedisClient\Pipeline\PipelineInterface;
-use RedisClient\Pipeline\Version\Pipeline3x2;
+use RedisClient\Pipeline\Version\Pipeline2x9;
 
 /**
  * Class RedisClient
  * @package RedisClient
  */
-class RedisClient3x2 extends AbstractRedisClient {
+class RedisClient2x9 extends AbstractRedisClient {
     use CommandsTrait;
 
     /**
      * @param \Closure|null $Pipeline
      * @return PipelineInterface
      */
     protected function createPipeline(\Closure $Pipeline = null) {
-        return new Pipeline3x2($Pipeline);
+        return new Pipeline2x9($Pipeline);
     }
 
 }

src/RedisClient/Pipeline/Version/Pipeline2x6.php

@@ -183,7 +183,7 @@
  * @method $this multi()
  * @method $this unwatch()
  * @method $this watch($keys)
- *
+ * 
  */
 class Pipeline2x6 extends AbstractPipeline {
     use CommandsTrait;

src/RedisClient/Pipeline/Version/Pipeline2x8.php

@@ -220,7 +220,7 @@
  *
  * Strings
  * @method $this bitpos($key, $bit, $start = null, $end = null)
- *
+ * 
  */
 class Pipeline2x8 extends AbstractPipeline {
     use CommandsTrait;

src/RedisClient/Pipeline/Version/Pipeline2x9.php

@@ -225,7 +225,7 @@
  *
  * Server
  * @method $this clientPause($timeout)
- *
+ * 
  */
 class Pipeline2x9 extends AbstractPipeline {
     use CommandsTrait;

src/RedisClient/Pipeline/Version/Pipeline3x0.php

@@ -258,7 +258,7 @@
  *
  * SortedSets
  * @method $this zadd($key, array $members, $nx = null, $ch = false, $incr = false)
- *
+ * 
  */
 class Pipeline3x0 extends AbstractPipeline {
     use CommandsTrait;

src/RedisClient/Pipeline/Version/Pipeline3x2.php

@@ -266,7 +266,7 @@
  *
  * Sets
  * @method $this spop($key, $count = null)
- *
+ * 
  */
 class Pipeline3x2 extends AbstractPipeline {
     use CommandsTrait;

tools/generate-annotations-for-pipeline.php

@@ -9,19 +9,21 @@
  * file that was distributed with this source code.
  */
 
+const EOL = "\n";
+
 if ($argc === 2 && $argv[1] === '--help') {
-    echo '---'. PHP_EOL,
-        'Tools for generations annotations for Pipelines by versions'. PHP_EOL,
-        'Using: php ./tools/'. basename(__FILE__) .' > /save/to/file/path'. PHP_EOL,
-         '---'. PHP_EOL;
+    echo '---'. EOL,
+        'Tools for generations annotations for Pipelines by versions'. EOL,
+        'Using: php ./tools/'. basename(__FILE__) .' [update [backup]]'. EOL,
+         '---'. EOL;
     exit;
 }
 
 $lines = `grep -r 'function' ./src/RedisClient/Command/Traits/`;
 
 //Version3x0/SortedSetsCommandsTrait.php:    public function zrange($key, $start, $stop, $withscores = false)
 if (!preg_match_all('/Version(\d+x\d+)\/(\w+)CommandsTrait\.php.+public function (.+)\((.*)\)/im', $lines, $matches, PREG_SET_ORDER)) {
-    echo 'Not found'. PHP_EOL;
+    echo 'Not found'. EOL;
 }
 
 $versions = [];
@@ -42,20 +44,55 @@
 
 ksort($versions);
 
-$annotations = [];
-foreach ($versions as $version => $groups) {
-    $annotations[] = '';
-    $annotations[] = 'Redis version '. str_replace('x', '.', $version);
-    foreach ($groups as $group => $commands) {
+if (in_array('update', $argv)) {
+
+    $text = '';
+    foreach ($versions as $version => $groups) {
+        $annotations = [''];
+        $annotations[] = 'Redis version ' . ($ver = str_replace('x', '.', $version));
+        foreach ($groups as $group => $commands) {
+            $annotations[] = '';
+            $annotations[] = $group;
+            foreach ($commands as $command => $params) {
+                $annotations[] = '@method $this ' . $command . '(' . $params . ')';
+                // deactivation old version of commands
+                $text = str_replace('@method $this ' . $command . '(', '-method $this ' . $command . '(', $text);
+            }
+        }
         $annotations[] = '';
-        $annotations[] = $group;
-        //$annotations[] = '';
-        foreach ($commands as $command => $params) {
-            $annotations[] = '@method $this '. $command .'('. $params .')';
+        $text .= implode("\n * ", $annotations);
+        $text = str_replace("\n * \n", "\n *\n", $text);
+
+        if (!file_exists($file = './src/RedisClient/Pipeline/Version/Pipeline'.$version.'.php')) {
+            continue;
+        }
+
+        $old = file_get_contents($file);
+        $new = preg_replace('/(?<=\/\*\*)\n (.+\n)+(?= \*\/\nclass Pipeline'.$version.')/', ($text).EOL, $old);
+        if ($new) {
+            echo 'File '. $file .' - updated'. EOL;
+            if (in_array('backup', $argv)) {
+                copy($file, $back = __DIR__ . '/back/Pipeline' . $version . '.php.' . date('Ymd.His'));
+            }
+            file_put_contents($file, $new);
         }
     }
 
-}
-$annotations[] = '';
+} else {
+
+    $annotations = [];
+    foreach ($versions as $version => $groups) {
+        $annotations[] = '';
+        $annotations[] = 'Redis version ' . str_replace('x', '.', $version);
+        foreach ($groups as $group => $commands) {
+            $annotations[] = '';
+            $annotations[] = $group;
+            foreach ($commands as $command => $params) {
+                $annotations[] = '@method $this ' . $command . '(' . $params . ')';
+            }
+        }
 
-echo "/**". implode("\n * ", $annotations) ."\n */";
+    }
+    $annotations[] = '';
+    echo "/**" . implode("\n * ", $annotations) . "\n */";
+}