From 86732924bb7565eabc7141c20e5c048eef197e94 Mon Sep 17 00:00:00 2001 From: "R. Eric Wheeler" Date: Fri, 15 Jul 2016 04:25:25 -0700 Subject: [PATCH] Removed .idea directory --- .gitignore | 6 +- .idea/copyright/profiles_settings.xml | 3 - .idea/deployment.xml | 4 - .idea/modules.xml | 8 - .idea/resume.iml | 54 - .idea/vcs.xml | 6 - .idea/workspace.xml | 969 ------------------ bower.json | 8 +- .../Controller/ApiControllerProvider.php | 13 +- 9 files changed, 20 insertions(+), 1051 deletions(-) delete mode 100644 .idea/copyright/profiles_settings.xml delete mode 100644 .idea/deployment.xml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/resume.iml delete mode 100644 .idea/vcs.xml delete mode 100644 .idea/workspace.xml diff --git a/.gitignore b/.gitignore index e0dad73..5c9d004 100644 --- a/.gitignore +++ b/.gitignore @@ -3,5 +3,9 @@ *~ .*~ .idea/ - node_modules/ +data/cache/ +data/logs/ +web/css/ +web/fonts/ +web/js/ diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml deleted file mode 100644 index e7bedf3..0000000 --- a/.idea/copyright/profiles_settings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/.idea/deployment.xml b/.idea/deployment.xml deleted file mode 100644 index 45b2263..0000000 --- a/.idea/deployment.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 53838f6..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/resume.iml b/.idea/resume.iml deleted file mode 100644 index b449b05..0000000 --- a/.idea/resume.iml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml deleted file mode 100644 index 6af99c3..0000000 --- a/.idea/workspace.xml +++ /dev/null @@ -1,969 +0,0 @@ - - - -<<<<<<< Updated upstream - - - - - - - - - - - -======= - ->>>>>>> Stashed changes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - DEFINITION_ORDER - - - - - - - - - - - - - - - - AnnotationPHP - - - CSS - - - Code SmellPHP - - - Code StylePHP - - - CoffeeScript - - - Control FlowPHP - - - Control flow issuesJavaScript - - - Cucumber - - - DocBlocksJoomla! - - - Error handlingJavaScript - - - GeneralCoffeeScript - - - GeneralJavaScript - - - GeneralPHP - - - JavaScript - - - Joomla! - - - PHP - - - PHPDocPHP - - - Probable bugsPHP - - - RELAX NG - - - Type compatibilityPHP - - - UndefinedPHP - - - UnusedPHP - - - XML - - - XSLT - - - - - PhpUndefinedMethodInspection - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - project - - - - - - - - - - - - - - - - project - - - true - - bdd - - DIRECTORY - - false - - - - - - - - - - - - 1467508860123 - - - - -<<<<<<< Updated upstream - - - -======= - - - ->>>>>>> Stashed changes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/bower.json b/bower.json index cea06ff..7cb21a5 100644 --- a/bower.json +++ b/bower.json @@ -20,7 +20,8 @@ "uikit": "^2.26.3", "html5shiv": "^3.7.3", "respond": "^1.4.2", - "tinymce": "^4.4.0" + "tinymce": "^4.4.0", + "es6-shim": "^0.35.1" }, "overrides": { "uikit": { @@ -55,6 +56,11 @@ "main": [ "**/tinymce.min.js" ] + }, + "es6-shim": { + "main": [ + "**/es6-shim.min.js" + ] } } } diff --git a/src/Sikofitt/Controller/ApiControllerProvider.php b/src/Sikofitt/Controller/ApiControllerProvider.php index f71d740..bb47b20 100644 --- a/src/Sikofitt/Controller/ApiControllerProvider.php +++ b/src/Sikofitt/Controller/ApiControllerProvider.php @@ -24,23 +24,26 @@ namespace Sikofitt\Controller; -use Prophecy\Doubler\ClassPatch\ReflectionClassNewInstancePatch; + use ReCaptcha\ReCaptcha; -use Sikofitt\Form\Type\ContactType; use Silex\Api\ControllerProviderInterface; use Silex\Application; -use Silex\Provider\SecurityServiceProvider; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Validator\Constraints\Collection; use Symfony\Component\Validator\Constraints\Email; +use Symfony\Component\Validator\Constraints\EqualTo; use Symfony\Component\Validator\Constraints\Length; use Symfony\Component\Validator\Constraints\NotBlank; -use Symfony\Component\Validator\Constraints\EqualTo; -use Symfony\Component\Validator\ValidatorBuilder; +/** + * Class ApiControllerProvider + * + * @package Sikofitt\Controller + */ class ApiControllerProvider implements ControllerProviderInterface { + /** * {@inheritdoc} *