From b2b116a00a8fca0f501bd74d7691f12f7885aec1 Mon Sep 17 00:00:00 2001
From: Andrew Roslik <andkirby@gmail.com>
Date: Tue, 30 Aug 2016 15:24:11 +0300
Subject: [PATCH] Implemented #116: Rename "commithook files:allow-default" to
 "commithook files allow-default"  - enamed "commithook files:allow-default"
 to "commithook files allow-default"

---
 bin/commithook.php                            |   2 +-
 src/config/validators/FileFilter.xml          |  15 +++
 .../Command/Config/File/AllowDefault.php      | 123 ------------------
 .../Command/Config/File/FilesConfig.php       |  25 ++++
 4 files changed, 41 insertions(+), 124 deletions(-)
 delete mode 100644 src/lib/PreCommit/Console/Command/Config/File/AllowDefault.php
 create mode 100644 src/lib/PreCommit/Console/Command/Config/File/FilesConfig.php

diff --git a/bin/commithook.php b/bin/commithook.php
index 088ad21..07df8ad 100644
--- a/bin/commithook.php
+++ b/bin/commithook.php
@@ -20,7 +20,7 @@
 $app->add(new Config\File\Skip($root));
 $app->add(new Config\File\Protect($root));
 $app->add(new Config\File\Allow($root));
-$app->add(new Config\File\AllowDefault($root));
+$app->add(new Config\File\FilesConfig($root));
 $app->add(new Test($root));
 $app->add(new ClearCache($root));
 $app->add(new Validator\Disable($root));
diff --git a/src/config/validators/FileFilter.xml b/src/config/validators/FileFilter.xml
index 5cac66a..e966836 100644
--- a/src/config/validators/FileFilter.xml
+++ b/src/config/validators/FileFilter.xml
@@ -5,6 +5,21 @@
  */
 -->
 <config>
+    <console>
+        <files>
+            <description>FileFilter validator configuration.</description>
+            <args>
+                <allow-default>
+                    <xpath type="bool">validators/FileFilter/allowed_by_default</xpath>
+                    <description>This command can define configuration for allowing to commit files by default.</description>
+                    <scope>
+                        <default>project</default>
+                    </scope>
+                </allow-default>
+            </args>
+        </files>
+    </console>
+
     <validators>
         <FileFilter>
             <!--
diff --git a/src/lib/PreCommit/Console/Command/Config/File/AllowDefault.php b/src/lib/PreCommit/Console/Command/Config/File/AllowDefault.php
deleted file mode 100644
index bb6814d..0000000
--- a/src/lib/PreCommit/Console/Command/Config/File/AllowDefault.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-/**
- * @license https://raw.githubusercontent.com/andkirby/commithook/master/LICENSE.md
- */
-namespace PreCommit\Console\Command\Config\File;
-
-use PreCommit\Console\Command\AbstractCommand;
-use PreCommit\Console\Exception;
-use PreCommit\Validator\FileFilter;
-use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
-
-/**
- * This command can define path for allowing to commit a file
- *
- * @package PreCommit\Console\Command\Config\File
- */
-class AllowDefault extends Protect
-{
-    /**
-     * Execute command
-     *
-     * @param InputInterface  $input
-     * @param OutputInterface $output
-     * @return int
-     * @throws Exception
-     */
-    public function execute(InputInterface $input, OutputInterface $output)
-    {
-        AbstractCommand::execute($input, $output);
-
-        return $this->processValue();
-    }
-
-    /**
-     * Get key name
-     *
-     * @return string
-     * @throws Exception
-     */
-    protected function getKey()
-    {
-        return 'allow_default';
-    }
-
-    /**
-     * Init default helpers
-     *
-     * @return $this
-     */
-    protected function configureCommand()
-    {
-        $this->setName('files:allow-default');
-
-        $help = 'This command can define configuration for allowing to commit files by default.';
-
-        $this->setHelp($help);
-        $this->setDescription($help);
-
-        return $this;
-    }
-
-    /**
-     * Get xpath
-     *
-     * @param string $name
-     * @return string
-     */
-    protected function getXpath($name)
-    {
-        return FileFilter::XPATH_ALLOW_BY_DEFAULT;
-    }
-
-    /**
-     * Init input definitions
-     *
-     * @return $this
-     */
-    protected function configureInput()
-    {
-        AbstractCommand::configureInput();
-
-        $this->addArgument('value', InputArgument::OPTIONAL);
-
-        $this->setScopeOptions();
-
-        return $this;
-    }
-
-    /**
-     * Show set values
-     *
-     * @return $this
-     */
-    protected function showSetValues()
-    {
-        $this->processValue();
-
-        return $this;
-    }
-
-    /**
-     * Check if it should write value
-     *
-     * @return null|string
-     */
-    protected function shouldWriteValue()
-    {
-        return null !== $this->getValue();
-    }
-
-    /**
-     * Filter value
-     *
-     * @param string $xpath
-     * @return int
-     */
-    protected function fetchValue($xpath)
-    {
-        return (int) (bool) $this->getValue();
-    }
-}
diff --git a/src/lib/PreCommit/Console/Command/Config/File/FilesConfig.php b/src/lib/PreCommit/Console/Command/Config/File/FilesConfig.php
new file mode 100644
index 0000000..c0cc296
--- /dev/null
+++ b/src/lib/PreCommit/Console/Command/Config/File/FilesConfig.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * @license https://raw.githubusercontent.com/andkirby/commithook/master/LICENSE.md
+ */
+namespace PreCommit\Console\Command\Config\File;
+
+use PreCommit\Console\Command\Config\AbstractConfiguredCommand;
+
+/**
+ * This command can define path for allowing to commit a file
+ *
+ * @package PreCommit\Console\Command\Config\File
+ */
+class FilesConfig extends AbstractConfiguredCommand
+{
+    /**
+     * Get base command name
+     *
+     * @return string
+     */
+    protected function getDefinedName()
+    {
+        return 'files';
+    }
+}