Completed
Pull Request — develop (#501)
by ANTHONIUS
10:57
created
module/Settings/src/Form/FormAbstract.php 1 patch
Doc Comments   +8 added lines patch added patch discarded remove patch
@@ -31,6 +31,11 @@  discard block
 block discarded – undo
31 31
         return $this->hydrator;
32 32
     }
33 33
     
34
+    /**
35
+     * @param string $name
36
+     *
37
+     * @return callable
38
+     */
34 39
     protected function getPlugin($name)
35 40
     {
36 41
         $plugin = null;
@@ -69,6 +74,9 @@  discard block
 block discarded – undo
69 74
         $this->add($this->formManager->get('DefaultButtonsFieldset'));
70 75
     }
71 76
     
77
+    /**
78
+     * @return string
79
+     */
72 80
     abstract public function getCoreFieldset();
73 81
     
74 82
     /**
Please login to merge, or discard this patch.
module/Settings/src/Repository/Settings.php 1 patch
Doc Comments   -1 removed lines patch added patch discarded remove patch
@@ -44,7 +44,6 @@
 block discarded – undo
44 44
     
45 45
     /**
46 46
      * the $id for an entity 'setting' is the same as for the entity 'user'
47
-     * @param type $id
48 47
      */
49 48
     public function getSettingsByUser($user)
50 49
     {
Please login to merge, or discard this patch.
public/index.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -17,8 +17,8 @@
 block discarded – undo
17 17
 } else {
18 18
     echo '<p>Could not initialize autoloading. This happens, if the dependencies are not installed yet.</p>';
19 19
     echo '<p>Please try to install the dependencies via: </p>';
20
-    echo '<code>cd '. realpath('.') .'<br>./install.sh</code>';
21
-    echo '<p>exit at ' . __FILE__ . ' in line ' . __LINE__ .'</p>';
20
+    echo '<code>cd '.realpath('.').'<br>./install.sh</code>';
21
+    echo '<p>exit at '.__FILE__.' in line '.__LINE__.'</p>';
22 22
     exit;
23 23
 }
24 24
 
Please login to merge, or discard this patch.
etc/travis/autoload/MailServiceOptions.config.local.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@
 block discarded – undo
15 15
         'Core/MailServiceOptions' => [
16 16
             'options' => [
17 17
                 'transportClass' => 'file',
18
-                'path' => realpath(__DIR__ . '/../../build/mails')
18
+                'path' => realpath(__DIR__.'/../../build/mails')
19 19
             ],
20 20
         ],
21 21
     ]
Please login to merge, or discard this patch.
etc/travis/autoload/module.auth.local.php 2 patches
Indentation   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -6,7 +6,7 @@  discard block
 block discarded – undo
6 6
 $LINKEDIN_APP_SECRET    = getenv('LINKEDIN_APP_SECRET');
7 7
 
8 8
 return array(
9
-	'hybridauth' => array(
9
+    'hybridauth' => array(
10 10
         "Facebook" => array ( 
11 11
             "enabled" => true,
12 12
             "keys"    => array ( "id" => $FACEBOOK_APP_ID, "secret" => $FACEBOOK_APP_SECRET ),
@@ -30,13 +30,13 @@  discard block
 block discarded – undo
30 30
             "scope"   => ''
31 31
         ),
32 32
         "Google" => array(
33
-             // see http://hybridauth.sourceforge.net/userguide/IDProvider_info_Google.html
34
-             "enabled" => false,
35
-             'keys'    => array ( "id" => '###Your Google Client-ID ###', 'secret' => '###Your GitHub Secret###'),
36
-             "scope"   => "https://www.googleapis.com/auth/userinfo.profile ". // optional
37
-                          "https://www.googleapis.com/auth/userinfo.email"   , // optional
38
-             "access_type"     => "offline",   // optional
39
-             "approval_prompt" => "force",     // optional
33
+                // see http://hybridauth.sourceforge.net/userguide/IDProvider_info_Google.html
34
+                "enabled" => false,
35
+                'keys'    => array ( "id" => '###Your Google Client-ID ###', 'secret' => '###Your GitHub Secret###'),
36
+                "scope"   => "https://www.googleapis.com/auth/userinfo.profile ". // optional
37
+                            "https://www.googleapis.com/auth/userinfo.email"   , // optional
38
+                "access_type"     => "offline",   // optional
39
+                "approval_prompt" => "force",     // optional
40 40
         ),
41 41
 
42 42
 
@@ -47,12 +47,12 @@  discard block
 block discarded – undo
47 47
     ),
48 48
     
49 49
     'Auth' => array(
50
-    	'first_login' => array (
51
-    	    'role' => '%%role%%',                                            // role set on the first login.
52
-    	    'auth_suffix' => '%%auth.suffix%%',                              // an auth suffix is needed, if you plan to add external apps.
53
-    	),
54
-    	// this allows an external application to use the YAWIK API
55
-    	// applications[USERPOSTFIX] => AppKey
50
+        'first_login' => array (
51
+            'role' => '%%role%%',                                            // role set on the first login.
52
+            'auth_suffix' => '%%auth.suffix%%',                              // an auth suffix is needed, if you plan to add external apps.
53
+        ),
54
+        // this allows an external application to use the YAWIK API
55
+        // applications[USERPOSTFIX] => AppKey
56 56
         'external_applications' => array(
57 57
             '%%external.app.prefix%%' => '%%external.app.key%%',
58 58
         ),
Please login to merge, or discard this patch.
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -7,36 +7,36 @@  discard block
 block discarded – undo
7 7
 
8 8
 return array(
9 9
 	'hybridauth' => array(
10
-        "Facebook" => array ( 
10
+        "Facebook" => array( 
11 11
             "enabled" => true,
12
-            "keys"    => array ( "id" => $FACEBOOK_APP_ID, "secret" => $FACEBOOK_APP_SECRET ),
13
-            "scope"   => "email, user_about_me, user_birthday, user_hometown, user_work_history, user_education_history",// optional
12
+            "keys"    => array("id" => $FACEBOOK_APP_ID, "secret" => $FACEBOOK_APP_SECRET),
13
+            "scope"   => "email, user_about_me, user_birthday, user_hometown, user_work_history, user_education_history", // optional
14 14
             "display" => "popup"
15 15
 
16 16
         ),
17
-        "LinkedIn" => array (
17
+        "LinkedIn" => array(
18 18
             "enabled" => true,
19
-            "keys"    => array ( "id" => $LINKEDIN_APP_ID, "secret" => $LINKEDIN_APP_SECRET ),
19
+            "keys"    => array("id" => $LINKEDIN_APP_ID, "secret" => $LINKEDIN_APP_SECRET),
20 20
             "scope"   => "r_basicprofile,r_emailaddress"
21 21
         ),
22 22
         "XING" => array(
23 23
             "enabled" => false,
24
-            'keys'    => array ( "key" => '###XING APP KEY###', 'secret' => '### XING APP SECRET ###'),
24
+            'keys'    => array("key" => '###XING APP KEY###', 'secret' => '### XING APP SECRET ###'),
25 25
             "scope"   => ''
26 26
         ),
27 27
         "Github" => array(
28 28
             "enabled" => false,
29
-            'keys'    => array ( "id" => '###Your GitHub AppID ###', 'secret' => '###Your GitHub Secret###'),
29
+            'keys'    => array("id" => '###Your GitHub AppID ###', 'secret' => '###Your GitHub Secret###'),
30 30
             "scope"   => ''
31 31
         ),
32 32
         "Google" => array(
33 33
              // see http://hybridauth.sourceforge.net/userguide/IDProvider_info_Google.html
34 34
              "enabled" => false,
35
-             'keys'    => array ( "id" => '###Your Google Client-ID ###', 'secret' => '###Your GitHub Secret###'),
36
-             "scope"   => "https://www.googleapis.com/auth/userinfo.profile ". // optional
37
-                          "https://www.googleapis.com/auth/userinfo.email"   , // optional
38
-             "access_type"     => "offline",   // optional
39
-             "approval_prompt" => "force",     // optional
35
+             'keys'    => array("id" => '###Your Google Client-ID ###', 'secret' => '###Your GitHub Secret###'),
36
+             "scope"   => "https://www.googleapis.com/auth/userinfo.profile ".// optional
37
+                          "https://www.googleapis.com/auth/userinfo.email", // optional
38
+             "access_type"     => "offline", // optional
39
+             "approval_prompt" => "force", // optional
40 40
         ),
41 41
 
42 42
 
@@ -47,9 +47,9 @@  discard block
 block discarded – undo
47 47
     ),
48 48
     
49 49
     'Auth' => array(
50
-    	'first_login' => array (
51
-    	    'role' => '%%role%%',                                            // role set on the first login.
52
-    	    'auth_suffix' => '%%auth.suffix%%',                              // an auth suffix is needed, if you plan to add external apps.
50
+    	'first_login' => array(
51
+    	    'role' => '%%role%%', // role set on the first login.
52
+    	    'auth_suffix' => '%%auth.suffix%%', // an auth suffix is needed, if you plan to add external apps.
53 53
     	),
54 54
     	// this allows an external application to use the YAWIK API
55 55
     	// applications[USERPOSTFIX] => AppKey
Please login to merge, or discard this patch.
module/Geo/config/module.config.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@
 block discarded – undo
22 22
                  * for multiple paths.
23 23
                  * example https://github.com/doctrine/DoctrineORMModule
24 24
                  */
25
-                'paths' => [ __DIR__ . '/../src/Entity'],
25
+                'paths' => [__DIR__.'/../src/Entity'],
26 26
             ],
27 27
         ],
28 28
     ],
Please login to merge, or discard this patch.
module/Geo/src/Form/GeoSelectSimple.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
     {
54 54
         return new ClosureStrategy(
55 55
             /* extract */
56
-            function ($value) {
56
+            function($value) {
57 57
                 if ($value instanceof Location) {
58 58
                     return $value->toString();
59 59
                 }
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
             },
74 74
 
75 75
             /* hydrate */
76
-            function ($value) {
76
+            function($value) {
77 77
                 if (empty($value) || 0 !== strpos($value, '{')) {
78 78
                     return null;
79 79
                 }
Please login to merge, or discard this patch.
module/Geo/src/Module.php 2 patches
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -17,10 +17,10 @@
 block discarded – undo
17 17
 class Module
18 18
 {
19 19
     /**
20
-    * Loads module specific configuration.
21
-    *
22
-    * @return array
23
-    */
20
+     * Loads module specific configuration.
21
+     *
22
+     * @return array
23
+     */
24 24
     public function getConfig()
25 25
     {
26 26
         return include __DIR__ . '/../config/module.config.php';
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -23,6 +23,6 @@
 block discarded – undo
23 23
     */
24 24
     public function getConfig()
25 25
     {
26
-        return include __DIR__ . '/../config/module.config.php';
26
+        return include __DIR__.'/../config/module.config.php';
27 27
     }
28 28
 }
Please login to merge, or discard this patch.
module/Geo/src/Service/Photon.php 2 patches
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -63,16 +63,16 @@
 block discarded – undo
63 63
 
64 64
         foreach ($result as $key => $val) {
65 65
             $row=[
66
-                  'postalCode' => (property_exists($val->properties, 'postcode') ? $val->properties->postcode:''),
67
-                  'city' =>(property_exists($val->properties, 'city') ? $val->properties->city:''),
68
-                  'street' => (property_exists($val->properties, 'street') ? $val->properties->street : ''),
69
-                  'region' => (property_exists($val->properties, 'state') ? $val->properties->state : ''),
70
-                  'country' => (property_exists($val->properties, 'country') ? $val->properties->country : ''),
66
+                    'postalCode' => (property_exists($val->properties, 'postcode') ? $val->properties->postcode:''),
67
+                    'city' =>(property_exists($val->properties, 'city') ? $val->properties->city:''),
68
+                    'street' => (property_exists($val->properties, 'street') ? $val->properties->street : ''),
69
+                    'region' => (property_exists($val->properties, 'state') ? $val->properties->state : ''),
70
+                    'country' => (property_exists($val->properties, 'country') ? $val->properties->country : ''),
71 71
 
72
-                  'osm_key' => (property_exists($val->properties, 'osm_key') ? $val->properties->osm_key : ''),
73
-                  'osm_value' => (property_exists($val->properties, 'osm_value') ? $val->properties->osm_value : ''),
74
-                  //'id' => (property_exists($val->properties, 'osm_id') ? $val->properties->osm_id : uniqid()),
75
-                  //'data' => json_encode($val),
72
+                    'osm_key' => (property_exists($val->properties, 'osm_key') ? $val->properties->osm_key : ''),
73
+                    'osm_value' => (property_exists($val->properties, 'osm_value') ? $val->properties->osm_value : ''),
74
+                    //'id' => (property_exists($val->properties, 'osm_id') ? $val->properties->osm_id : uniqid()),
75
+                    //'data' => json_encode($val),
76 76
             ];
77 77
             if ($val->geometry) {
78 78
                 $row['coordinates'] = [
Please login to merge, or discard this patch.
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -26,12 +26,12 @@  discard block
 block discarded – undo
26 26
         $client->setMethod('GET');
27 27
 
28 28
         $osmTags = [
29
-            'tourism','aeroway','railway', 'amenity', 'historic', 'tunnel', 'mountain_pass',
29
+            'tourism', 'aeroway', 'railway', 'amenity', 'historic', 'tunnel', 'mountain_pass',
30 30
             'leisure', 'natural', 'bridge', 'waterway'
31 31
         ];
32 32
 
33
-        $osmTags = array_map(function ($i) {
34
-            return urlencode('!' . $i);
33
+        $osmTags = array_map(function($i) {
34
+            return urlencode('!'.$i);
35 35
         }, $osmTags);
36 36
 
37 37
         $uri = sprintf(
@@ -59,12 +59,12 @@  discard block
 block discarded – undo
59 59
     {
60 60
         $result = json_decode($result);
61 61
         $result = $result->features;
62
-        $r=[];
62
+        $r = [];
63 63
 
64 64
         foreach ($result as $key => $val) {
65
-            $row=[
66
-                  'postalCode' => (property_exists($val->properties, 'postcode') ? $val->properties->postcode:''),
67
-                  'city' =>(property_exists($val->properties, 'city') ? $val->properties->city:''),
65
+            $row = [
66
+                  'postalCode' => (property_exists($val->properties, 'postcode') ? $val->properties->postcode : ''),
67
+                  'city' =>(property_exists($val->properties, 'city') ? $val->properties->city : ''),
68 68
                   'street' => (property_exists($val->properties, 'street') ? $val->properties->street : ''),
69 69
                   'region' => (property_exists($val->properties, 'state') ? $val->properties->state : ''),
70 70
                   'country' => (property_exists($val->properties, 'country') ? $val->properties->country : ''),
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
                 ];
82 82
             }
83 83
             //$row['id'] = json_encode($row);
84
-            $r[]=$row;
84
+            $r[] = $row;
85 85
         }
86 86
         return $r;
87 87
     }
Please login to merge, or discard this patch.