From c1adb7a74e1736111bbd37b2289f874246185961 Mon Sep 17 00:00:00 2001
From: Nikita Popov <nikita.ppv@gmail.com>
Date: Mon, 16 Sep 2019 20:18:00 +0200
Subject: [PATCH] Move scripts out of corpus/ directory

---
 sapi/fuzzer/README.md                                  | 6 +++---
 sapi/fuzzer/{corpus/parser.dict => dict/parser}        | 0
 sapi/fuzzer/{corpus => }/generate_parser_corpus.php    | 4 ++--
 sapi/fuzzer/{corpus => }/generate_unserialize_dict.php | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename sapi/fuzzer/{corpus/parser.dict => dict/parser} (100%)
 rename sapi/fuzzer/{corpus => }/generate_parser_corpus.php (86%)
 rename sapi/fuzzer/{corpus => }/generate_unserialize_dict.php (70%)

diff --git a/sapi/fuzzer/README.md b/sapi/fuzzer/README.md
index 2cdbb1c5a30..b07428f0415 100644
--- a/sapi/fuzzer/README.md
+++ b/sapi/fuzzer/README.md
@@ -35,15 +35,15 @@ sapi/fuzzer/php-fuzz-exif ./my-exif-corpus
 For the unserialize fuzzer, a dictionary of internal classes should be generated first:
 
 ```sh
-sapi/cli/php sapi/fuzzer/corpus/generate_unserialize_dict.php
+sapi/cli/php sapi/fuzzer/generate_unserialize_dict.php
 cp -r sapi/fuzzer/corpus/unserialize ./my-unserialize-corpus
-sapi/fuzzer/php-fuzz-unserialize -dict=$PWD/sapi/fuzzer/corpus/unserialize.dict ./my-unserialize-corpus
+sapi/fuzzer/php-fuzz-unserialize -dict=$PWD/sapi/fuzzer/dict/unserialize ./my-unserialize-corpus
 ```
 
 For the parser fuzzer, a corpus may be generated from Zend test files:
 
 ```sh
-sapi/cli/php sapi/fuzzer/corpus/generate_parser_corpus.php
+sapi/cli/php sapi/fuzzer/generate_parser_corpus.php
 mkdir ./my-parser-corpus
 sapi/fuzzer/php-fuzz-parser -merge=1 ./my-parser-corpus sapi/fuzzer/corpus/parser
 sapi/fuzzer/php-fuzz-parser -only_ascii=1 ./my-parser-corpus
diff --git a/sapi/fuzzer/corpus/parser.dict b/sapi/fuzzer/dict/parser
similarity index 100%
rename from sapi/fuzzer/corpus/parser.dict
rename to sapi/fuzzer/dict/parser
diff --git a/sapi/fuzzer/corpus/generate_parser_corpus.php b/sapi/fuzzer/generate_parser_corpus.php
similarity index 86%
rename from sapi/fuzzer/corpus/generate_parser_corpus.php
rename to sapi/fuzzer/generate_parser_corpus.php
index 7d9cdf98d18..e8d27e189ba 100644
--- a/sapi/fuzzer/corpus/generate_parser_corpus.php
+++ b/sapi/fuzzer/generate_parser_corpus.php
@@ -1,12 +1,12 @@
 <?php
 
-$testsDir = __DIR__ . '/../../../Zend/tests/';
+$testsDir = __DIR__ . '/../../Zend/tests/';
 $it = new RecursiveIteratorIterator(
     new RecursiveDirectoryIterator($testsDir),
     RecursiveIteratorIterator::LEAVES_ONLY
 );
 
-$corpusDir = __DIR__ . '/parser';
+$corpusDir = __DIR__ . '/corpus/parser';
 @mkdir($corpusDir);
 
 foreach ($it as $file) {
diff --git a/sapi/fuzzer/corpus/generate_unserialize_dict.php b/sapi/fuzzer/generate_unserialize_dict.php
similarity index 70%
rename from sapi/fuzzer/corpus/generate_unserialize_dict.php
rename to sapi/fuzzer/generate_unserialize_dict.php
index 4c20ed7e934..cf270788d39 100644
--- a/sapi/fuzzer/corpus/generate_unserialize_dict.php
+++ b/sapi/fuzzer/generate_unserialize_dict.php
@@ -6,4 +6,4 @@ foreach (get_declared_classes() as $class) {
     $dict .= "\"$len:\\\"$class\\\"\"\n";
 }
 
-file_put_contents(__DIR__ . "/unserialize.dict", $dict);
+file_put_contents(__DIR__ . "/dict/unserialize", $dict);