diff --git a/doc/standard.php b/doc/standard.php index cbacdee35f..c1efd12a80 100644 --- a/doc/standard.php +++ b/doc/standard.php @@ -1,63 +1,52 @@ + * @author XX * @package example * @link http://www.zentao.net */ -``` -版权信息修改： - example 为当前模块，author修改成自己的账号，package写当前模块名； -## 2. 模块目录约定 -最新的目录结构 -``` -task/ - config/ - form.php #表单的配置项,用于form::use()->create(); - table.php #列表页面表格的配置 - css/ - create.ui.css - js/ - create.ui.js - lang/ - zh-cn.php - test/ #单元测试用例 - control/ - create.php - model/ - create.php - task.class.php - ui/ - create.html.php #新版view页面 - view/ - create.html.php #旧版view页面，全部改版完成后删除 - config.php - control.php - model.php - tao.php - zen.php +## 3. 模块目录约定 最新的目录结构 +#task/ +# config/ +# form.php #表单的配置项,用于form::use()->create(); +# table.php #列表页面表格的配置 +# css/ +# create.ui.css +# js/ +# create.ui.js +# lang/ +# zh-cn.php +# test/ #单元测试用例 +# control/ +# create.php +# model/ +# create.php +# task.class.php +# ui/ +# create.html.php #新版view页面 +# view/ +# create.html.php #旧版view页面，全部改版完成后删除 +# config.php +# control.php +# model.php +# tao.php +# zen.php -``` - -## 3. 使用TDD方式进行开发 +## 4. 使用TDD方式进行开发 先编写单元测试用例，然后编写功能代码 -## 4. 区分public和protected方法 +## 5. 区分public和protected方法 外部模块可访问的方法使用public，只有自己模块调用的方法使用protected修饰 -## 5. 代码分为ui/control/zen/model/tao，共5个层次； +## 6. 代码分为ui/control/zen/model/tao，共5个层次； 1）ui: 新版Zin代码 2）control/zen: public方法放在control，protected放在zen； @@ -66,22 +55,21 @@ task/ 注意：页面跳转，js输出等需要放到control层 3）model/tao: public方法放在model，protected放在tao； model里为对外提供的方法，为public。tao的操作必须为单一的，一次查询、插入、一个表。 -## 6. POST表单的数据处理统一使用form类 - 1)在module/xxx/config/form中定义 - ``` +# 6. POST表单的数据处理统一使用form类 +## 1)在module/xxx/config/form中定义 + $config->example->form->create = array(); $config->example->form->create['name'] = array('type' => 'string', 'r e q u i r ed' => true, 'filter' => 'trim'); $config->example->form->create['PO'] = array('type' => 'account', 'r e q u i r ed' => false, 'default' => ''); $config->example->form->create['createdDate'] = array('type' => 'date', 'r e q u i r ed' => false, 'default' => helper::now()); $config->example->form->create['createdVersion'] = array('type' => 'string', 'r e q u i r ed' => false, 'default' => $this->config->version); -``` - 2)调用form进行处理 -`$data = form::use($this->config->example->create)->create();` +## 2)调用form进行处理 +$data = form::use($this->config->example->create)->create(); + +# - 注意代码编写时位置关系：select、insert +# 7. Control层作为入口，处理请求参数 -- 注意代码编写时位置关系：select、insert -## 7. Control层作为入口，处理请求参数 -``` public function edit($projectID) { if(!empty($_POST)) @@ -93,15 +81,15 @@ public function edit($projectID) ...... $this->zen->buildEditForm($projectID); } -``` -在调用zen的过程中，如果业务比较复杂，推荐使用以下形式 + +# 在调用zen的过程中，如果业务比较复杂，推荐使用以下形式 $this->projectZen->beforeEdit(); $this->projectZen->edit(); $this->projectZen->afterEdit(); ## 8. zen层的方法，再次拆分后使用private修饰 -```php + protected function create() { $this->story->createBranch(); @@ -110,9 +98,8 @@ private function createBranch() { ... } -``` + ## 9. 缩写在语言项都放在一起 -```php #之前的缩写是使用下面这个形式： $lang->bug->story = '研发需求'; @@ -122,13 +109,13 @@ $lang->bug->storyAB = '需求'; $lang->bug->story = '研发需求'; $lang->bug->abbr = new stdclass(); $lang->bug->abbr->story = '需求'; -``` + ## 10. 方法要细分，每个函数的代码行数不超过50行 ## 11. MySQL的sql_mode使用strict模式 - 1) 对于GROUP BY聚合操作,如果在SELECT中的列,没有在GROUP BY中出现,那么这个SQL是不合法的,因为列不在GROUP BY从句中 - 2) 不允许日期和月份为零，必须使用NULL - 3) TEXT类型不能有默认值，建议设为NULL - 4) 不能用双引号来引用字符串,必须使用单引号 +## 1) 对于GROUP BY聚合操作,如果在SELECT中的列,没有在GROUP BY中出现,那么这个SQL是不合法的,因为列不在GROUP BY从句中 +## 2) 不允许日期和月份为零，必须使用NULL +## 3) TEXT类型不能有默认值，建议设为NULL +## 4) 不能用双引号来引用字符串,必须使用单引号 ## 12. 错误和提醒的语言项，统一在一起编写 $lang->example->error = new stdclass(); @@ -138,11 +125,9 @@ $lang->example->notice = new stdclass(); $lang->example->notice->nameEmpty = '请填写名称'; ## 13. 代码注释使用中英文两种语言 -每个模块重构的方法注释使用中英文两种语言，方法内部的注释如果使用英文表述不够贴切也需要使用中文 +# 每个模块重构的方法注释使用中英文两种语言，方法内部的注释如果使用英文表述不够贴切也需要使用中文 -## 14. Model层方法命名 - 所有的方法必须在文件中有序的组织起来，相似功能的函数放在一起，比如 -``` +## 14. Model层方法命名 所有的方法必须在文件中有序的组织起来，相似功能的函数放在一起，比如 getBuildsByProject() { } getReleasesByProjects() { } ... @@ -151,25 +136,33 @@ $lang->example->notice->nameEmpty = '请填写名称'; ... start() { } finish() { } -``` -1) 获取一个对象 - getXXByYY，比如 getBuildsByProject($projectID) - 如果获取本模块的数据，可以缩写为getByYY，比如 getByID($projectID) +# 1) 获取一个对象 getXXByYY，比如 +getBuildsByProject($projectID); +# 如果获取本模块的数据，可以缩写为getByYY，比如 +getByID($projectID) +# 2) 返回一个对象数组 -2) 返回一个对象数组 -``` $this->project->getList(); $this->project->getTeamMembers($projectID); $this->project->getListByProductAndProgram($productID, $programID); -``` -3) 返回一个key/value数组，比如 - getProductPairs(); - 本模块缩写为 getPairs(); - 4) 批量操作 - batchCreate($projectID, $formData) -5) 更新操作 - update($projectID, $formData) -6) 其他操作 - start($projectID) - finish($projectID) + +# 3) 返回一个key/value数组，比如 +getProductPairs(); +# 本模块缩写为 +getPairs(); +# 4) 批量操作 +batchCreate($projectID, $formData) +# 5) 更新操作 +update($projectID, $formData) +# 6) 其他操作 +start($projectID) +finish($projectID) + + +# api/v1 -> module/api/v1 +# sdk -> lib/sdk +# zin -> lib/zin zin.php -> zin.class.php +# roadrunner 转移走 +# xuanxuan -> extension + diff --git a/lib/form/form.class.php b/lib/form/form.class.php index 2648673911..743ff2c745 100644 --- a/lib/form/form.class.php +++ b/lib/form/form.class.php @@ -47,20 +47,6 @@ class form extends baseFixer return $isRaw ? $this->rawdata : $this->data; } - public function get($fields = '') - { - if(empty($fields)) return $this->data; - if(strpos($fields, ',') === false) return $this->data->$fields; - - $fields = array_flip(explode(',', $fields)); - foreach($this->data as $field => $value) - { - if(!isset($fields[$field])) unset($this->data->$field); - } - - return $this->data; - } - public function convertField($field, $config) { if(isset($config['required']) && $config['required'] && !isset($this->rawdata->$field)) diff --git a/tools/check.php b/misc/check.php similarity index 100% rename from tools/check.php rename to misc/check.php diff --git a/tools/checklangfile.php b/misc/checklangfile.php similarity index 100% rename from tools/checklangfile.php rename to misc/checklangfile.php diff --git a/tools/cn2tw.php b/misc/cn2tw.php similarity index 100% rename from tools/cn2tw.php rename to misc/cn2tw.php diff --git a/tools/compatibility/PHPCompatibility/CHANGELOG.md b/misc/compatibility/PHPCompatibility/CHANGELOG.md similarity index 100% rename from tools/compatibility/PHPCompatibility/CHANGELOG.md rename to misc/compatibility/PHPCompatibility/CHANGELOG.md diff --git a/tools/compatibility/PHPCompatibility/LICENSE b/misc/compatibility/PHPCompatibility/LICENSE similarity index 100% rename from tools/compatibility/PHPCompatibility/LICENSE rename to misc/compatibility/PHPCompatibility/LICENSE diff --git a/tools/compatibility/PHPCompatibility/PHPCSAliases.php b/misc/compatibility/PHPCompatibility/PHPCSAliases.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCSAliases.php rename to misc/compatibility/PHPCompatibility/PHPCSAliases.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/AbstractComplexVersionSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/AbstractComplexVersionSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/AbstractComplexVersionSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/AbstractComplexVersionSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/AbstractFunctionCallParameterSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/AbstractFunctionCallParameterSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/AbstractFunctionCallParameterSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/AbstractFunctionCallParameterSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/AbstractNewFeatureSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/AbstractNewFeatureSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/AbstractNewFeatureSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/AbstractNewFeatureSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/AbstractRemovedFeatureSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/AbstractRemovedFeatureSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/AbstractRemovedFeatureSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/AbstractRemovedFeatureSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/ComplexVersionInterface.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/ComplexVersionInterface.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/ComplexVersionInterface.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/ComplexVersionInterface.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/PHPCSHelper.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/PHPCSHelper.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/PHPCSHelper.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/PHPCSHelper.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Classes/ForbiddenAbstractPrivateMethodsSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Classes/ForbiddenAbstractPrivateMethodsSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Classes/ForbiddenAbstractPrivateMethodsSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Classes/ForbiddenAbstractPrivateMethodsSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Classes/NewAnonymousClassesSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Classes/NewAnonymousClassesSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Classes/NewAnonymousClassesSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Classes/NewAnonymousClassesSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Classes/NewClassesSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Classes/NewClassesSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Classes/NewClassesSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Classes/NewClassesSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Classes/NewConstVisibilitySniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Classes/NewConstVisibilitySniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Classes/NewConstVisibilitySniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Classes/NewConstVisibilitySniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Classes/NewLateStaticBindingSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Classes/NewLateStaticBindingSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Classes/NewLateStaticBindingSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Classes/NewLateStaticBindingSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Classes/NewTypedPropertiesSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Classes/NewTypedPropertiesSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Classes/NewTypedPropertiesSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Classes/NewTypedPropertiesSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Classes/RemovedOrphanedParentSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Classes/RemovedOrphanedParentSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Classes/RemovedOrphanedParentSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Classes/RemovedOrphanedParentSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Constants/NewConstantsSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Constants/NewConstantsSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Constants/NewConstantsSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Constants/NewConstantsSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Constants/NewMagicClassConstantSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Constants/NewMagicClassConstantSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Constants/NewMagicClassConstantSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Constants/NewMagicClassConstantSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Constants/RemovedConstantsSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Constants/RemovedConstantsSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Constants/RemovedConstantsSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Constants/RemovedConstantsSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ControlStructures/DiscouragedSwitchContinueSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ControlStructures/DiscouragedSwitchContinueSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ControlStructures/DiscouragedSwitchContinueSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ControlStructures/DiscouragedSwitchContinueSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ControlStructures/ForbiddenBreakContinueOutsideLoopSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ControlStructures/ForbiddenBreakContinueOutsideLoopSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ControlStructures/ForbiddenBreakContinueOutsideLoopSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ControlStructures/ForbiddenBreakContinueOutsideLoopSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ControlStructures/ForbiddenBreakContinueVariableArgumentsSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ControlStructures/ForbiddenBreakContinueVariableArgumentsSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ControlStructures/ForbiddenBreakContinueVariableArgumentsSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ControlStructures/ForbiddenBreakContinueVariableArgumentsSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ControlStructures/ForbiddenSwitchWithMultipleDefaultBlocksSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ControlStructures/ForbiddenSwitchWithMultipleDefaultBlocksSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ControlStructures/ForbiddenSwitchWithMultipleDefaultBlocksSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ControlStructures/ForbiddenSwitchWithMultipleDefaultBlocksSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ControlStructures/NewExecutionDirectivesSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ControlStructures/NewExecutionDirectivesSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ControlStructures/NewExecutionDirectivesSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ControlStructures/NewExecutionDirectivesSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ControlStructures/NewForeachExpressionReferencingSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ControlStructures/NewForeachExpressionReferencingSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ControlStructures/NewForeachExpressionReferencingSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ControlStructures/NewForeachExpressionReferencingSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ControlStructures/NewListInForeachSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ControlStructures/NewListInForeachSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ControlStructures/NewListInForeachSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ControlStructures/NewListInForeachSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ControlStructures/NewMultiCatchSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ControlStructures/NewMultiCatchSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ControlStructures/NewMultiCatchSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ControlStructures/NewMultiCatchSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Extensions/RemovedExtensionsSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Extensions/RemovedExtensionsSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Extensions/RemovedExtensionsSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Extensions/RemovedExtensionsSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionDeclarations/ForbiddenParameterShadowSuperGlobalsSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionDeclarations/ForbiddenParameterShadowSuperGlobalsSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionDeclarations/ForbiddenParameterShadowSuperGlobalsSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionDeclarations/ForbiddenParameterShadowSuperGlobalsSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionDeclarations/ForbiddenParametersWithSameNameSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionDeclarations/ForbiddenParametersWithSameNameSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionDeclarations/ForbiddenParametersWithSameNameSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionDeclarations/ForbiddenParametersWithSameNameSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionDeclarations/ForbiddenToStringParametersSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionDeclarations/ForbiddenToStringParametersSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionDeclarations/ForbiddenToStringParametersSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionDeclarations/ForbiddenToStringParametersSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionDeclarations/ForbiddenVariableNamesInClosureUseSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionDeclarations/ForbiddenVariableNamesInClosureUseSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionDeclarations/ForbiddenVariableNamesInClosureUseSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionDeclarations/ForbiddenVariableNamesInClosureUseSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionDeclarations/NewClosureSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionDeclarations/NewClosureSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionDeclarations/NewClosureSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionDeclarations/NewClosureSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionDeclarations/NewExceptionsFromToStringSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionDeclarations/NewExceptionsFromToStringSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionDeclarations/NewExceptionsFromToStringSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionDeclarations/NewExceptionsFromToStringSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionDeclarations/NewNullableTypesSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionDeclarations/NewNullableTypesSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionDeclarations/NewNullableTypesSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionDeclarations/NewNullableTypesSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionDeclarations/NewParamTypeDeclarationsSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionDeclarations/NewParamTypeDeclarationsSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionDeclarations/NewParamTypeDeclarationsSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionDeclarations/NewParamTypeDeclarationsSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionDeclarations/NewReturnTypeDeclarationsSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionDeclarations/NewReturnTypeDeclarationsSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionDeclarations/NewReturnTypeDeclarationsSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionDeclarations/NewReturnTypeDeclarationsSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionDeclarations/NonStaticMagicMethodsSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionDeclarations/NonStaticMagicMethodsSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionDeclarations/NonStaticMagicMethodsSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionDeclarations/NonStaticMagicMethodsSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionNameRestrictions/NewMagicMethodsSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionNameRestrictions/NewMagicMethodsSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionNameRestrictions/NewMagicMethodsSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionNameRestrictions/NewMagicMethodsSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionNameRestrictions/RemovedMagicAutoloadSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionNameRestrictions/RemovedMagicAutoloadSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionNameRestrictions/RemovedMagicAutoloadSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionNameRestrictions/RemovedMagicAutoloadSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionNameRestrictions/RemovedNamespacedAssertSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionNameRestrictions/RemovedNamespacedAssertSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionNameRestrictions/RemovedNamespacedAssertSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionNameRestrictions/RemovedNamespacedAssertSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionNameRestrictions/RemovedPHP4StyleConstructorsSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionNameRestrictions/RemovedPHP4StyleConstructorsSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionNameRestrictions/RemovedPHP4StyleConstructorsSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionNameRestrictions/RemovedPHP4StyleConstructorsSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionNameRestrictions/ReservedFunctionNamesSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionNameRestrictions/ReservedFunctionNamesSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionNameRestrictions/ReservedFunctionNamesSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionNameRestrictions/ReservedFunctionNamesSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionUse/ArgumentFunctionsReportCurrentValueSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionUse/ArgumentFunctionsReportCurrentValueSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionUse/ArgumentFunctionsReportCurrentValueSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionUse/ArgumentFunctionsReportCurrentValueSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionUse/ArgumentFunctionsUsageSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionUse/ArgumentFunctionsUsageSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionUse/ArgumentFunctionsUsageSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionUse/ArgumentFunctionsUsageSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionUse/NewFunctionParametersSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionUse/NewFunctionParametersSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionUse/NewFunctionParametersSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionUse/NewFunctionParametersSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionUse/NewFunctionsSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionUse/NewFunctionsSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionUse/NewFunctionsSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionUse/NewFunctionsSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionUse/OptionalToRequiredFunctionParametersSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionUse/OptionalToRequiredFunctionParametersSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionUse/OptionalToRequiredFunctionParametersSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionUse/OptionalToRequiredFunctionParametersSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionUse/RemovedFunctionParametersSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionUse/RemovedFunctionParametersSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionUse/RemovedFunctionParametersSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionUse/RemovedFunctionParametersSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionUse/RemovedFunctionsSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionUse/RemovedFunctionsSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionUse/RemovedFunctionsSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionUse/RemovedFunctionsSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionUse/RequiredToOptionalFunctionParametersSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionUse/RequiredToOptionalFunctionParametersSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionUse/RequiredToOptionalFunctionParametersSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/FunctionUse/RequiredToOptionalFunctionParametersSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Generators/NewGeneratorReturnSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Generators/NewGeneratorReturnSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Generators/NewGeneratorReturnSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Generators/NewGeneratorReturnSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/IniDirectives/NewIniDirectivesSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/IniDirectives/NewIniDirectivesSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/IniDirectives/NewIniDirectivesSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/IniDirectives/NewIniDirectivesSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/IniDirectives/RemovedIniDirectivesSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/IniDirectives/RemovedIniDirectivesSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/IniDirectives/RemovedIniDirectivesSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/IniDirectives/RemovedIniDirectivesSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/InitialValue/NewConstantArraysUsingConstSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/InitialValue/NewConstantArraysUsingConstSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/InitialValue/NewConstantArraysUsingConstSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/InitialValue/NewConstantArraysUsingConstSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/InitialValue/NewConstantArraysUsingDefineSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/InitialValue/NewConstantArraysUsingDefineSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/InitialValue/NewConstantArraysUsingDefineSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/InitialValue/NewConstantArraysUsingDefineSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/InitialValue/NewConstantScalarExpressionsSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/InitialValue/NewConstantScalarExpressionsSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/InitialValue/NewConstantScalarExpressionsSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/InitialValue/NewConstantScalarExpressionsSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/InitialValue/NewHeredocSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/InitialValue/NewHeredocSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/InitialValue/NewHeredocSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/InitialValue/NewHeredocSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Interfaces/InternalInterfacesSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Interfaces/InternalInterfacesSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Interfaces/InternalInterfacesSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Interfaces/InternalInterfacesSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Interfaces/NewInterfacesSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Interfaces/NewInterfacesSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Interfaces/NewInterfacesSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Interfaces/NewInterfacesSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Keywords/CaseSensitiveKeywordsSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Keywords/CaseSensitiveKeywordsSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Keywords/CaseSensitiveKeywordsSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Keywords/CaseSensitiveKeywordsSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Keywords/ForbiddenNamesAsDeclaredSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Keywords/ForbiddenNamesAsDeclaredSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Keywords/ForbiddenNamesAsDeclaredSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Keywords/ForbiddenNamesAsDeclaredSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Keywords/ForbiddenNamesAsInvokedFunctionsSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Keywords/ForbiddenNamesAsInvokedFunctionsSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Keywords/ForbiddenNamesAsInvokedFunctionsSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Keywords/ForbiddenNamesAsInvokedFunctionsSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Keywords/ForbiddenNamesSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Keywords/ForbiddenNamesSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Keywords/ForbiddenNamesSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Keywords/ForbiddenNamesSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Keywords/NewKeywordsSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Keywords/NewKeywordsSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Keywords/NewKeywordsSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Keywords/NewKeywordsSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/LanguageConstructs/NewEmptyNonVariableSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/LanguageConstructs/NewEmptyNonVariableSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/LanguageConstructs/NewEmptyNonVariableSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/LanguageConstructs/NewEmptyNonVariableSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/LanguageConstructs/NewLanguageConstructsSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/LanguageConstructs/NewLanguageConstructsSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/LanguageConstructs/NewLanguageConstructsSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/LanguageConstructs/NewLanguageConstructsSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Lists/AssignmentOrderSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Lists/AssignmentOrderSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Lists/AssignmentOrderSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Lists/AssignmentOrderSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Lists/ForbiddenEmptyListAssignmentSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Lists/ForbiddenEmptyListAssignmentSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Lists/ForbiddenEmptyListAssignmentSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Lists/ForbiddenEmptyListAssignmentSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Lists/NewKeyedListSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Lists/NewKeyedListSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Lists/NewKeyedListSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Lists/NewKeyedListSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Lists/NewListReferenceAssignmentSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Lists/NewListReferenceAssignmentSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Lists/NewListReferenceAssignmentSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Lists/NewListReferenceAssignmentSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Lists/NewShortListSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Lists/NewShortListSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Lists/NewShortListSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Lists/NewShortListSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/MethodUse/ForbiddenToStringParametersSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/MethodUse/ForbiddenToStringParametersSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/MethodUse/ForbiddenToStringParametersSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/MethodUse/ForbiddenToStringParametersSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/MethodUse/NewDirectCallsToCloneSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/MethodUse/NewDirectCallsToCloneSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/MethodUse/NewDirectCallsToCloneSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/MethodUse/NewDirectCallsToCloneSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Miscellaneous/NewPHPOpenTagEOFSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Miscellaneous/NewPHPOpenTagEOFSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Miscellaneous/NewPHPOpenTagEOFSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Miscellaneous/NewPHPOpenTagEOFSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Miscellaneous/RemovedAlternativePHPTagsSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Miscellaneous/RemovedAlternativePHPTagsSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Miscellaneous/RemovedAlternativePHPTagsSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Miscellaneous/RemovedAlternativePHPTagsSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Miscellaneous/ValidIntegersSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Miscellaneous/ValidIntegersSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Miscellaneous/ValidIntegersSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Miscellaneous/ValidIntegersSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Operators/ChangedConcatOperatorPrecedenceSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Operators/ChangedConcatOperatorPrecedenceSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Operators/ChangedConcatOperatorPrecedenceSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Operators/ChangedConcatOperatorPrecedenceSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Operators/ForbiddenNegativeBitshiftSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Operators/ForbiddenNegativeBitshiftSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Operators/ForbiddenNegativeBitshiftSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Operators/ForbiddenNegativeBitshiftSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Operators/NewOperatorsSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Operators/NewOperatorsSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Operators/NewOperatorsSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Operators/NewOperatorsSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Operators/NewShortTernarySniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Operators/NewShortTernarySniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Operators/NewShortTernarySniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Operators/NewShortTernarySniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Operators/RemovedTernaryAssociativitySniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Operators/RemovedTernaryAssociativitySniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Operators/RemovedTernaryAssociativitySniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Operators/RemovedTernaryAssociativitySniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/ForbiddenGetClassNullSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/ForbiddenGetClassNullSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/ForbiddenGetClassNullSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/ForbiddenGetClassNullSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/ForbiddenStripTagsSelfClosingXHTMLSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/ForbiddenStripTagsSelfClosingXHTMLSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/ForbiddenStripTagsSelfClosingXHTMLSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/ForbiddenStripTagsSelfClosingXHTMLSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/NewArrayReduceInitialTypeSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/NewArrayReduceInitialTypeSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/NewArrayReduceInitialTypeSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/NewArrayReduceInitialTypeSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/NewFopenModesSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/NewFopenModesSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/NewFopenModesSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/NewFopenModesSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/NewHTMLEntitiesEncodingDefaultSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/NewHTMLEntitiesEncodingDefaultSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/NewHTMLEntitiesEncodingDefaultSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/NewHTMLEntitiesEncodingDefaultSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/NewHashAlgorithmsSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/NewHashAlgorithmsSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/NewHashAlgorithmsSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/NewHashAlgorithmsSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/NewIDNVariantDefaultSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/NewIDNVariantDefaultSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/NewIDNVariantDefaultSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/NewIDNVariantDefaultSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/NewIconvMbstringCharsetDefaultSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/NewIconvMbstringCharsetDefaultSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/NewIconvMbstringCharsetDefaultSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/NewIconvMbstringCharsetDefaultSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/NewNegativeStringOffsetSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/NewNegativeStringOffsetSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/NewNegativeStringOffsetSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/NewNegativeStringOffsetSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/NewPCREModifiersSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/NewPCREModifiersSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/NewPCREModifiersSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/NewPCREModifiersSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/NewPackFormatSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/NewPackFormatSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/NewPackFormatSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/NewPackFormatSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/NewPasswordAlgoConstantValuesSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/NewPasswordAlgoConstantValuesSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/NewPasswordAlgoConstantValuesSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/NewPasswordAlgoConstantValuesSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/NewProcOpenCmdArraySniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/NewProcOpenCmdArraySniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/NewProcOpenCmdArraySniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/NewProcOpenCmdArraySniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/NewStripTagsAllowableTagsArraySniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/NewStripTagsAllowableTagsArraySniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/NewStripTagsAllowableTagsArraySniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/NewStripTagsAllowableTagsArraySniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/RemovedHashAlgorithmsSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/RemovedHashAlgorithmsSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/RemovedHashAlgorithmsSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/RemovedHashAlgorithmsSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/RemovedIconvEncodingSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/RemovedIconvEncodingSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/RemovedIconvEncodingSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/RemovedIconvEncodingSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/RemovedImplodeFlexibleParamOrderSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/RemovedImplodeFlexibleParamOrderSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/RemovedImplodeFlexibleParamOrderSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/RemovedImplodeFlexibleParamOrderSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/RemovedMbStrrposEncodingThirdParamSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/RemovedMbStrrposEncodingThirdParamSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/RemovedMbStrrposEncodingThirdParamSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/RemovedMbStrrposEncodingThirdParamSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/RemovedMbstringModifiersSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/RemovedMbstringModifiersSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/RemovedMbstringModifiersSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/RemovedMbstringModifiersSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/RemovedNonCryptoHashSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/RemovedNonCryptoHashSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/RemovedNonCryptoHashSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/RemovedNonCryptoHashSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/RemovedPCREModifiersSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/RemovedPCREModifiersSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/RemovedPCREModifiersSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/RemovedPCREModifiersSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/RemovedSetlocaleStringSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/RemovedSetlocaleStringSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/RemovedSetlocaleStringSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/ParameterValues/RemovedSetlocaleStringSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Syntax/ForbiddenCallTimePassByReferenceSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Syntax/ForbiddenCallTimePassByReferenceSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Syntax/ForbiddenCallTimePassByReferenceSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Syntax/ForbiddenCallTimePassByReferenceSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Syntax/NewArrayStringDereferencingSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Syntax/NewArrayStringDereferencingSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Syntax/NewArrayStringDereferencingSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Syntax/NewArrayStringDereferencingSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Syntax/NewArrayUnpackingSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Syntax/NewArrayUnpackingSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Syntax/NewArrayUnpackingSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Syntax/NewArrayUnpackingSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Syntax/NewClassMemberAccessSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Syntax/NewClassMemberAccessSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Syntax/NewClassMemberAccessSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Syntax/NewClassMemberAccessSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Syntax/NewDynamicAccessToStaticSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Syntax/NewDynamicAccessToStaticSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Syntax/NewDynamicAccessToStaticSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Syntax/NewDynamicAccessToStaticSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Syntax/NewFlexibleHeredocNowdocSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Syntax/NewFlexibleHeredocNowdocSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Syntax/NewFlexibleHeredocNowdocSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Syntax/NewFlexibleHeredocNowdocSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Syntax/NewFunctionArrayDereferencingSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Syntax/NewFunctionArrayDereferencingSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Syntax/NewFunctionArrayDereferencingSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Syntax/NewFunctionArrayDereferencingSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Syntax/NewFunctionCallTrailingCommaSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Syntax/NewFunctionCallTrailingCommaSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Syntax/NewFunctionCallTrailingCommaSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Syntax/NewFunctionCallTrailingCommaSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Syntax/NewShortArraySniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Syntax/NewShortArraySniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Syntax/NewShortArraySniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Syntax/NewShortArraySniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Syntax/RemovedCurlyBraceArrayAccessSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Syntax/RemovedCurlyBraceArrayAccessSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Syntax/RemovedCurlyBraceArrayAccessSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Syntax/RemovedCurlyBraceArrayAccessSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Syntax/RemovedNewReferenceSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Syntax/RemovedNewReferenceSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Syntax/RemovedNewReferenceSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Syntax/RemovedNewReferenceSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/TextStrings/NewUnicodeEscapeSequenceSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/TextStrings/NewUnicodeEscapeSequenceSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/TextStrings/NewUnicodeEscapeSequenceSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/TextStrings/NewUnicodeEscapeSequenceSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/TypeCasts/NewTypeCastsSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/TypeCasts/NewTypeCastsSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/TypeCasts/NewTypeCastsSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/TypeCasts/NewTypeCastsSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/TypeCasts/RemovedTypeCastsSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/TypeCasts/RemovedTypeCastsSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/TypeCasts/RemovedTypeCastsSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/TypeCasts/RemovedTypeCastsSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Upgrade/LowPHPCSSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Upgrade/LowPHPCSSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Upgrade/LowPHPCSSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Upgrade/LowPHPCSSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Upgrade/LowPHPSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Upgrade/LowPHPSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Upgrade/LowPHPSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Upgrade/LowPHPSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/UseDeclarations/NewGroupUseDeclarationsSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/UseDeclarations/NewGroupUseDeclarationsSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/UseDeclarations/NewGroupUseDeclarationsSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/UseDeclarations/NewGroupUseDeclarationsSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/UseDeclarations/NewUseConstFunctionSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/UseDeclarations/NewUseConstFunctionSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/UseDeclarations/NewUseConstFunctionSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/UseDeclarations/NewUseConstFunctionSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Variables/ForbiddenGlobalVariableVariableSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Variables/ForbiddenGlobalVariableVariableSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Variables/ForbiddenGlobalVariableVariableSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Variables/ForbiddenGlobalVariableVariableSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Variables/ForbiddenThisUseContextsSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Variables/ForbiddenThisUseContextsSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Variables/ForbiddenThisUseContextsSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Variables/ForbiddenThisUseContextsSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Variables/NewUniformVariableSyntaxSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Variables/NewUniformVariableSyntaxSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Variables/NewUniformVariableSyntaxSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Variables/NewUniformVariableSyntaxSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Variables/RemovedPredefinedGlobalVariablesSniff.php b/misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Variables/RemovedPredefinedGlobalVariablesSniff.php similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Variables/RemovedPredefinedGlobalVariablesSniff.php rename to misc/compatibility/PHPCompatibility/PHPCompatibility/Sniffs/Variables/RemovedPredefinedGlobalVariablesSniff.php diff --git a/tools/compatibility/PHPCompatibility/PHPCompatibility/ruleset.xml b/misc/compatibility/PHPCompatibility/PHPCompatibility/ruleset.xml similarity index 100% rename from tools/compatibility/PHPCompatibility/PHPCompatibility/ruleset.xml rename to misc/compatibility/PHPCompatibility/PHPCompatibility/ruleset.xml diff --git a/tools/compatibility/PHPCompatibility/README.md b/misc/compatibility/PHPCompatibility/README.md similarity index 100% rename from tools/compatibility/PHPCompatibility/README.md rename to misc/compatibility/PHPCompatibility/README.md diff --git a/tools/compatibility/PHPCompatibility/composer.json b/misc/compatibility/PHPCompatibility/composer.json similarity index 100% rename from tools/compatibility/PHPCompatibility/composer.json rename to misc/compatibility/PHPCompatibility/composer.json diff --git a/tools/compatibility/PHPCompatibility/phpunit-bootstrap.php b/misc/compatibility/PHPCompatibility/phpunit-bootstrap.php similarity index 100% rename from tools/compatibility/PHPCompatibility/phpunit-bootstrap.php rename to misc/compatibility/PHPCompatibility/phpunit-bootstrap.php diff --git a/tools/compatibility/check.sh b/misc/compatibility/check.sh similarity index 100% rename from tools/compatibility/check.sh rename to misc/compatibility/check.sh diff --git a/tools/compatibility/phpcbf.phar b/misc/compatibility/phpcbf.phar similarity index 100% rename from tools/compatibility/phpcbf.phar rename to misc/compatibility/phpcbf.phar diff --git a/tools/compatibility/phpcs.phar b/misc/compatibility/phpcs.phar similarity index 100% rename from tools/compatibility/phpcs.phar rename to misc/compatibility/phpcs.phar diff --git a/tools/compatibility/ruleset.xml b/misc/compatibility/ruleset.xml similarity index 100% rename from tools/compatibility/ruleset.xml rename to misc/compatibility/ruleset.xml diff --git a/tools/copylang.php b/misc/copylang.php similarity index 100% rename from tools/copylang.php rename to misc/copylang.php diff --git a/tools/difflang.php b/misc/difflang.php similarity index 100% rename from tools/difflang.php rename to misc/difflang.php diff --git a/tools/en2other.php b/misc/en2other.php similarity index 100% rename from tools/en2other.php rename to misc/en2other.php diff --git a/tools/exportactions.php b/misc/exportactions.php similarity index 100% rename from tools/exportactions.php rename to misc/exportactions.php diff --git a/tools/getallcommon.php b/misc/getallcommon.php similarity index 100% rename from tools/getallcommon.php rename to misc/getallcommon.php diff --git a/tools/initext.php b/misc/initext.php similarity index 100% rename from tools/initext.php rename to misc/initext.php diff --git a/tools/minifyfront.php b/misc/minifyfront.php similarity index 100% rename from tools/minifyfront.php rename to misc/minifyfront.php diff --git a/tools/packDeb.php b/misc/packDeb.php similarity index 100% rename from tools/packDeb.php rename to misc/packDeb.php diff --git a/tools/packRpm.php b/misc/packRpm.php similarity index 100% rename from tools/packRpm.php rename to misc/packRpm.php diff --git a/tools/packZip.php b/misc/packZip.php similarity index 100% rename from tools/packZip.php rename to misc/packZip.php diff --git a/tools/preparetest.php b/misc/preparetest.php similarity index 100% rename from tools/preparetest.php rename to misc/preparetest.php diff --git a/tools/prepareupdate.php b/misc/prepareupdate.php similarity index 100% rename from tools/prepareupdate.php rename to misc/prepareupdate.php diff --git a/tools/privchangelog.php b/misc/privchangelog.php similarity index 100% rename from tools/privchangelog.php rename to misc/privchangelog.php diff --git a/tools/replace.sh b/misc/replace.sh similarity index 100% rename from tools/replace.sh rename to misc/replace.sh diff --git a/tools/sync2cdn.sh b/misc/sync2cdn.sh similarity index 100% rename from tools/sync2cdn.sh rename to misc/sync2cdn.sh diff --git a/tools/syncext.php b/misc/syncext.php similarity index 100% rename from tools/syncext.php rename to misc/syncext.php diff --git a/tools/syncext.sh b/misc/syncext.sh similarity index 100% rename from tools/syncext.sh rename to misc/syncext.sh diff --git a/tools/zdog.sh b/misc/zdog.sh similarity index 100% rename from tools/zdog.sh rename to misc/zdog.sh diff --git a/module/action/lang/de.php b/module/action/lang/de.php index f4a7199288..5214eafede 100644 --- a/module/action/lang/de.php +++ b/module/action/lang/de.php @@ -162,6 +162,7 @@ $lang->action->objectTypes['repo'] = 'Repo'; $lang->action->objectTypes['dataview'] = 'Data View'; $lang->action->objectTypes['privlang'] = 'Priv'; $lang->action->objectTypes['scene'] = 'Scene'; +$lang->action->objectTypes['privpackage'] = 'Priv Package'; /* Used to describe operation history. */ $lang->action->desc = new stdclass(); diff --git a/module/action/lang/en.php b/module/action/lang/en.php index 573afc3ba2..4aada15413 100755 --- a/module/action/lang/en.php +++ b/module/action/lang/en.php @@ -162,6 +162,7 @@ $lang->action->objectTypes['repo'] = 'Repo'; $lang->action->objectTypes['dataview'] = 'Data View'; $lang->action->objectTypes['privlang'] = 'Priv'; $lang->action->objectTypes['scene'] = 'Scene'; +$lang->action->objectTypes['privpackage'] = 'Priv Package'; /* Used to describe operation history. */ $lang->action->desc = new stdclass(); diff --git a/module/action/lang/fr.php b/module/action/lang/fr.php index fcec4f79be..458690ad55 100644 --- a/module/action/lang/fr.php +++ b/module/action/lang/fr.php @@ -162,6 +162,7 @@ $lang->action->objectTypes['repo'] = 'Repo'; $lang->action->objectTypes['dataview'] = 'Data View'; $lang->action->objectTypes['privlang'] = 'Priv'; $lang->action->objectTypes['scene'] = 'Scene'; +$lang->action->objectTypes['privpackage'] = 'Priv Package'; /* Used to describe operation history. */ $lang->action->desc = new stdclass(); diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php index 6996d80c6d..0335e8a451 100755 --- a/module/action/lang/zh-cn.php +++ b/module/action/lang/zh-cn.php @@ -162,6 +162,7 @@ $lang->action->objectTypes['repo'] = '代码库'; $lang->action->objectTypes['dataview'] = '中间表'; $lang->action->objectTypes['privlang'] = '权限'; $lang->action->objectTypes['scene'] = '场景'; +$lang->action->objectTypes['privpackage'] = '权限包'; /* 用来描述操作历史记录。*/ $lang->action->desc = new stdclass(); diff --git a/module/execution/model.php b/module/execution/model.php index fb92c42f96..6895d02cb3 100755 --- a/module/execution/model.php +++ b/module/execution/model.php @@ -5784,11 +5784,6 @@ class executionModel extends model $post = $_POST; $_POST = array(); - $extendFields = $this->getExtendFields(); - foreach(array_keys($extendFields) as $field) - { - if(isset($post[$field])) $_POST[$field] = $post[$field]; - } $_POST['project'] = $projectID; $_POST['name'] = $project->name; @@ -5843,11 +5838,6 @@ class executionModel extends model $post = $_POST; $_POST = array(); - $extendFields = $this->getExtendFields(); - foreach(array_keys($extendFields) as $field) - { - if(isset($post[$field])) $_POST[$field] = $post[$field]; - } $_POST['project'] = $projectID; $_POST['name'] = $project->name; @@ -6037,23 +6027,4 @@ class executionModel extends model } return $sortedExecutions; } - - /** - * Get Extend Fields in workflow. - * - * @param string $module - * @access public - * @return array - */ - public function getExtendFields($module = 'project') - { - $extendFields = $this->dao->select('field') - ->from(TABLE_WORKFLOWFIELD) - ->where('module')->eq('project') - ->andWhere('buildin')->eq(0) - ->andWhere('role')->eq('custom') - ->fetchPairs('field'); - - return $extendFields; - } } diff --git a/module/group/control.php b/module/group/control.php index 6539e1abd1..4fbc88f405 100644 --- a/module/group/control.php +++ b/module/group/control.php @@ -509,25 +509,24 @@ class group extends control if($browseType == 'bycard') { $privs = $this->group->getPrivsListByView($view); - $privPackages = $this->group->getPrivPackagePairs(); - $privLang = $this->group->getPrivLangPairs(); + $privs = $this->group->transformPrivLang($privs); + $privPackages = $this->group->getPrivManagerPairs('package'); $privList = array(); foreach($privs as $privID => $priv) { - if(!isset($privList[$priv->module])) $privList[$priv->module] = array(); - if(!isset($privList[$priv->module][$priv->package])) $privList[$priv->module][$priv->package] = array(); - $privList[$priv->module][$priv->package][$priv->id] = $priv; + if(!isset($privList[$priv->parentCode])) $privList[$priv->parentCode] = array(); + if(!is_array($privList[$priv->parentCode])) $privList[$priv->parentCode] = array(); + if(!isset($privList[$priv->parentCode][$priv->parent])) $privList[$priv->parentCode][$priv->parent] = array(); + $privList[$priv->parentCode][$priv->parent][$priv->key] = $priv; } - $this->view->privLang = $privLang; $this->view->privPackages = $privPackages; } else { $privList = $browseType != 'bysearch' ? $this->group->getPrivsListByView($view) : $this->group->getPrivsListBySearch($paramID); - - foreach($privList as $privID => $priv) if(!$this->group->checkMenuModule($view, $priv->module)) unset($privList[$privID]); + $privs = $this->group->transformPrivLang($privList); /* Pager. */ $this->app->loadClass('pager', $static = true); @@ -552,7 +551,7 @@ class group extends control $this->view->title = $this->lang->group->editManagePriv; $this->view->browseType = $browseType; $this->view->privList = $privList; - $this->view->packages = $this->group->getPrivPackagePairs($view); + $this->view->packages = $this->group->getPrivManagerPairs('package'); $this->view->moduleLang = $moduleLang; $this->view->modulePackages = $this->group->getModuleAndPackageTree(); $this->view->view = $view; @@ -613,7 +612,7 @@ class group extends control } $this->view->title = $this->lang->group->createPrivPackage; - $this->view->modules = $this->group->getPrivModules(); + $this->view->modules = $this->group->getPrivManagerPairs('module', '', 'name', true); $this->display(); } @@ -639,7 +638,7 @@ class group extends control $this->view->title = $this->lang->group->editPrivPackage; $this->view->privPackage = $this->group->getPrivPackageByID($privPackageID); - $this->view->modules = $this->group->getPrivModules(); + $this->view->modules = $this->group->getPrivManagerPairs('module', '', 'name', true); $this->view->actions = $this->loadModel('action')->getList('privpackage', $privPackageID); $this->view->users = $this->loadModel('user')->getPairs(); $this->display(); @@ -657,25 +656,12 @@ class group extends control { $orders = $_POST['orders']; if(empty($orders)) return false; - if($type == 'view') + + $orders = explode(',', $orders); + + foreach($orders as $index => $id) { - $orders = str_replace('View,', ',', $orders); - $orders = trim($orders, ','); - $this->loadModel('setting')->setItem("system.priv.views", $orders); - } - if($type == 'module') - { - $orders = trim($orders, ','); - $parentID = rtrim($parentID, 'View'); - $this->loadModel('setting')->setItem("system.priv.{$parentID}Modules", $orders); - } - if($type == 'package') - { - $orders = explode(',', $orders); - foreach($orders as $index => $id) - { - if(!empty($id)) $this->dao->update(TABLE_PRIVPACKAGE)->set('order')->eq(($index + 1) * 5)->where('id')->eq($id)->exec(); - } + if(!empty($id)) $this->dao->update(TABLE_PRIVMANAGER)->set('order')->eq(($index + 1) * 5)->where('id')->eq($id)->exec(); } } @@ -695,7 +681,7 @@ class group extends control else { $privPackage = $this->group->getPrivPackageByID($privPackageID); - $this->group->deletePrivPackage($privPackageID); + $this->group->deletePrivPackage($privPackageID, $privPackage->parent); if(!dao::isError()) $this->loadModel('action')->create('privpackage', $privPackageID, 'deleted', '', zget($privPackage, 'name')); return print(js::reload('parent')); @@ -724,16 +710,20 @@ class group extends control } $privs = $this->group->getPrivByIdList($privIdList); + $privs = $this->group->transformPrivLang($privs); $modules = array(); foreach($privs as $priv) $modules[$priv->module] = $priv->module; $modulePrivs = $this->group->getPrivByModule($modules); $packageIdList = array(); - foreach($modulePrivs as $packagePrivs) $packageIdList = array_unique(array_merge($packageIdList, array_keys($packagePrivs))); + foreach($modulePrivs as $packagePrivs) + { + $packageIdList = array_unique(array_merge($packageIdList, array_keys($packagePrivs))); + } $this->view->privs = $privs; $this->view->modules = array('' => $this->lang->group->selectModule) + $this->group->getMenuModules(null, true); - $this->view->packages = $this->dao->select('*')->from(TABLE_PRIVPACKAGE)->where('id')->in($packageIdList)->orderBy('`order`')->fetchPairs('id', 'name'); + $this->view->packages = $this->group->getPrivManagerPairs('package', current($modules)); $this->view->modulePrivs = $modulePrivs; $this->view->type = $type; $this->display(); @@ -787,7 +777,7 @@ class group extends control $this->view->privs = $privs; $this->view->modules = array('' => $this->lang->group->selectModule) + $this->group->getMenuModules(null, true); - $this->view->packages = $this->dao->select('*')->from(TABLE_PRIVPACKAGE)->where('id')->in($packageIdList)->orderBy('`order`')->fetchPairs('id', 'name'); + $this->view->packages = $this->group->getPrivManagerPairs('package', current($modules)); $this->view->modulePrivs = $modulePrivs; $this->view->type = $type; $this->display('group', 'addrelation'); @@ -806,12 +796,9 @@ class group extends control { if(is_string($privIdList)) $privIdList = explode(',', $privIdList); - $modulePrivs = $this->group->getPrivByModule($module); - $packageIdList = array(); - foreach($modulePrivs as $packagePrivs) $packageIdList = array_unique(array_merge($packageIdList, array_keys($packagePrivs))); - - $modules = $this->group->getMenuModules(null, true); - $packages = $this->dao->select('*')->from(TABLE_PRIVPACKAGE)->where('id')->in($packageIdList)->orderBy('`order`')->fetchPairs('id', 'name'); + $modulePrivs = $this->group->getPrivByModule($module); + $modules = $this->group->getMenuModules(null, true); + $packages = $this->group->getPrivManagerPairs('package', $module); $tree = "