Added TipGroup Feature

Reworked Acceptancetests
timohund · Sep 15, 2015 · 879b0f8 · 879b0f8
1 parent a5a9714
commit 879b0f8
Show file tree

Hide file tree

Showing 45 changed files with 6,107 additions and 2,236 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,4 @@ app/cache/*
 app/logs/*
 bin/*
 tests/_log/*
+web/*
diff --git a/app/Resources/views/home.html.twig b/app/Resources/views/home.html.twig
@@ -77,7 +77,7 @@
 
 									{% if is_granted('ROLE_USER') %}
 										<li>
-											<a href="/logout" class="animate">Logout</a>
+											<a href="/logout" class="animate" id="logout">Logout</a>
 										</li>
 									{% endif %}
 							</ul>

diff --git a/app/Resources/views/subpage.html.twig b/app/Resources/views/subpage.html.twig
@@ -84,10 +84,14 @@
 											<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Mein Account <span class="caret"></span></a>
 											<ul class="dropdown-menu">
 												<li>
-													<a href="{{ path('fos_user_security_logout') }}" class="animate">Logout</a>
+													<a href="{{ path('ts_superkicker_tipgroup_edit') }}" id="tipgroups" class="animate">Gruppen</a>
+												</li>
+
+												<li>
+													<a href="{{ path('fos_user_change_password') }}" id="change_password">Passwort ändern</a>
 												</li>
 												<li>
-													<a href="{{ path('fos_user_change_password') }}">Passwort ändern</a>
+													<a href="{{ path('fos_user_security_logout') }}" class="animate" id="logout">Logout</a>
 												</li>
 											</ul>
 										</li>

diff --git a/app/SymfonyRequirements.php b/app/SymfonyRequirements.php
@@ -638,7 +638,7 @@ function_exists('posix_isatty'),
         }
 
         $this->addRecommendation(
-            class_exists('Locale'),
+            extension_loaded('intl'),
             'intl extension should be available',
             'Install and enable the <strong>intl</strong> extension (used for validators).'
         );

diff --git a/app/check.php b/app/check.php
@@ -42,9 +42,9 @@
 }
 
 if ($checkPassed) {
-    echo_block('success', 'OK', 'Your system is ready to run Symfony2 projects', true);
+    echo_block('success', 'OK', 'Your system is ready to run Symfony2 projects');
 } else {
-    echo_block('error', 'ERROR', 'Your system is not ready to run Symfony2 projects', true);
+    echo_block('error', 'ERROR', 'Your system is not ready to run Symfony2 projects');
 
     echo_title('Fix the following mandatory requirements', 'red');
 

diff --git a/app/config/parameters.yml b/app/config/parameters.yml
@@ -18,4 +18,6 @@ parameters:
     facebook_client_id: dsdsds
     facebook_client_secret: sasasa
     google_client_id: sasasa
-    google_client_secret: sasasa
+    google_client_secret: sasasa
+    twitter_client_id: sasasa
+    twitter_client_secret: sasasa
diff --git a/composer.json b/composer.json
@@ -1,4 +1,5 @@
 {
+    "minimum-stability": "dev",
     "name": "ts/superkicker",
     "license": "MIT",
     "type": "project",
@@ -33,8 +34,8 @@
 		"sebastian/phpcpd": "*",
 		"phploc/phploc": "*",
 		"squizlabs/php_codesniffer": "1.*",
-		"phpunit/phpunit": "3.7.*",
-        "codeception/codeception": "*"
+		"phpunit/phpunit": "*",
+        "codeception/codeception": "2.0.15"
     },
     "scripts": {
         "post-root-package-install": [
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,3 +5,4 @@ app/cache/* @@
     app/logs/*
     bin/*
     tests/_log/*
+    web/*