Completed
Branch develop (7585df)
by Carsten
11:01
created
module/Geo/src/Geo/Controller/Plugin/Photon.php 2 patches
Indentation   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * YAWIK
4
- *
5
- * @filesource
6
- * @copyright (c) 2013-2015 Cross Solution (http://cross-solution.de)
7
- * @license   MIT
8
- */
3
+     * YAWIK
4
+     *
5
+     * @filesource
6
+     * @copyright (c) 2013-2015 Cross Solution (http://cross-solution.de)
7
+     * @license   MIT
8
+     */
9 9
 
10 10
 namespace Geo\Controller\Plugin;
11 11
 
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
22 22
         $lang   = $this->getController()->getEvent()->getRouteMatch()->getParam('lang', 'en');
23 23
 
24 24
         if (empty($config['geocoder_photon_url'])) {
25
-             throw new \InvalidArgumentException('Now Service-Adress for Geo-Service available');
25
+                throw new \InvalidArgumentException('Now Service-Adress for Geo-Service available');
26 26
         }
27 27
         $client = new \Zend\Http\Client($config['geocoder_photon_url']);
28 28
         $client->setMethod('GET');
@@ -51,16 +51,16 @@  discard block
 block discarded – undo
51 51
         $result = $result->features;
52 52
         foreach ($result as $key => $val) {
53 53
             $row=['name' => (property_exists($val->properties, 'name') ? $val->properties->name:''),
54
-                  'postcode' => (property_exists($val->properties, 'postcode') ? $val->properties->postcode:''),
55
-                  'city' =>(property_exists($val->properties, 'city') ? $val->properties->city:''),
56
-                  'street' => (property_exists($val->properties, 'street') ? $val->properties->street : ''),
57
-                  'state' => (property_exists($val->properties, 'state') ? $val->properties->state : ''),
58
-                  'country' => (property_exists($val->properties, 'country') ? $val->properties->country : ''),
59
-                  'coordinates' => implode(":", $val->geometry->coordinates),
60
-                  'osm_key' => (property_exists($val->properties, 'osm_key') ? $val->properties->osm_key : ''),
61
-                  'osm_value' => (property_exists($val->properties, 'osm_value') ? $val->properties->osm_value : ''),
62
-                  'osm_id' => (property_exists($val->properties, 'osm_id') ? $val->properties->osm_id : ''),
63
-                  'data' => json_encode($val),
54
+                    'postcode' => (property_exists($val->properties, 'postcode') ? $val->properties->postcode:''),
55
+                    'city' =>(property_exists($val->properties, 'city') ? $val->properties->city:''),
56
+                    'street' => (property_exists($val->properties, 'street') ? $val->properties->street : ''),
57
+                    'state' => (property_exists($val->properties, 'state') ? $val->properties->state : ''),
58
+                    'country' => (property_exists($val->properties, 'country') ? $val->properties->country : ''),
59
+                    'coordinates' => implode(":", $val->geometry->coordinates),
60
+                    'osm_key' => (property_exists($val->properties, 'osm_key') ? $val->properties->osm_key : ''),
61
+                    'osm_value' => (property_exists($val->properties, 'osm_value') ? $val->properties->osm_value : ''),
62
+                    'osm_id' => (property_exists($val->properties, 'osm_id') ? $val->properties->osm_id : ''),
63
+                    'data' => json_encode($val),
64 64
             ];
65 65
             $r[] = $row;
66 66
         }
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
         $client->setMethod('GET');
29 29
 
30 30
         $osmTags = [
31
-            'tourism','aeroway','railway', 'amenity', 'historic', 'tunnel', 'mountain_pass',
31
+            'tourism', 'aeroway', 'railway', 'amenity', 'historic', 'tunnel', 'mountain_pass',
32 32
             'leisure', 'natural', 'bridge', 'waterway'
33 33
         ];
34 34
 
@@ -50,9 +50,9 @@  discard block
 block discarded – undo
50 50
         $result = json_decode($result);
51 51
         $result = $result->features;
52 52
         foreach ($result as $key => $val) {
53
-            $row=['name' => (property_exists($val->properties, 'name') ? $val->properties->name:''),
54
-                  'postcode' => (property_exists($val->properties, 'postcode') ? $val->properties->postcode:''),
55
-                  'city' =>(property_exists($val->properties, 'city') ? $val->properties->city:''),
53
+            $row = ['name' => (property_exists($val->properties, 'name') ? $val->properties->name : ''),
54
+                  'postcode' => (property_exists($val->properties, 'postcode') ? $val->properties->postcode : ''),
55
+                  'city' =>(property_exists($val->properties, 'city') ? $val->properties->city : ''),
56 56
                   'street' => (property_exists($val->properties, 'street') ? $val->properties->street : ''),
57 57
                   'state' => (property_exists($val->properties, 'state') ? $val->properties->state : ''),
58 58
                   'country' => (property_exists($val->properties, 'country') ? $val->properties->country : ''),
Please login to merge, or discard this patch.
module/Geo/src/Geo/Form/GeoText/Converter.php 1 patch
Indentation   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * YAWIK
4
- *
5
- * @filesource
6
- * @license MIT
7
- * @copyright  2013 - 2015 Cross Solution <http://cross-solution.de>
8
- */
3
+     * YAWIK
4
+     *
5
+     * @filesource
6
+     * @license MIT
7
+     * @copyright  2013 - 2015 Cross Solution <http://cross-solution.de>
8
+     */
9 9
   
10 10
 /** */
11 11
 namespace Geo\Form\GeoText;
@@ -35,11 +35,11 @@  discard block
 block discarded – undo
35 35
         }
36 36
         $entity = new Location();
37 37
         $entity->setCity($data['city'])
38
-               ->setRegion($data['region'])
39
-               ->setPostalcode($data['postalcode'])
40
-               ->setCountry($data['country']);
38
+                ->setRegion($data['region'])
39
+                ->setPostalcode($data['postalcode'])
40
+                ->setCountry($data['country']);
41 41
         if (!empty($data['coordinates'])) {
42
-               $entity->setCoordinates(new Point($data['coordinates']));
42
+                $entity->setCoordinates(new Point($data['coordinates']));
43 43
         }
44 44
 
45 45
 
Please login to merge, or discard this patch.
module/Install/Module.php 1 patch
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * YAWIK
4
- *
5
- * @filesource
6
- * @license MIT
7
- * @copyright  2013 - 2015 Cross Solution <http://cross-solution.de>
8
- */
3
+     * YAWIK
4
+     *
5
+     * @filesource
6
+     * @license MIT
7
+     * @copyright  2013 - 2015 Cross Solution <http://cross-solution.de>
8
+     */
9 9
   
10 10
 /** */
11 11
 namespace Install;
@@ -60,6 +60,6 @@  discard block
 block discarded – undo
60 60
         $services     = $application->getServiceManager();
61 61
 
62 62
         $services->get('Install/Listener/LanguageSetter')
63
-                 ->attach($eventManager);
63
+                    ->attach($eventManager);
64 64
     }
65 65
 }
Please login to merge, or discard this patch.
module/Install/config/module.config.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * YAWIK
4
- *
5
- * @filesource
6
- * @license MIT
7
- * @copyright  2013 - 2015 Cross Solution <http://cross-solution.de>
8
- */
3
+        * YAWIK
4
+        *
5
+        * @filesource
6
+        * @license MIT
7
+        * @copyright  2013 - 2015 Cross Solution <http://cross-solution.de>
8
+        */
9 9
 
10 10
 return array(
11 11
 
Please login to merge, or discard this patch.
module/Install/src/Controller/Plugin/UserCreator.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -66,7 +66,7 @@
 block discarded – undo
66 66
             'role' => 'admin',
67 67
             'login' => $username,
68 68
             'credential' => $credential,
69
-            'info' => [ 'email' => $email ]
69
+            'info' => ['email' => $email]
70 70
         );
71 71
 
72 72
         $result = $collection->insert($document);
Please login to merge, or discard this patch.
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * YAWIK
4
- *
5
- * @filesource
6
- * @license MIT
7
- * @copyright  2013 - 2015 Cross Solution <http://cross-solution.de>
8
- */
3
+     * YAWIK
4
+     *
5
+     * @filesource
6
+     * @license MIT
7
+     * @copyright  2013 - 2015 Cross Solution <http://cross-solution.de>
8
+     */
9 9
   
10 10
 /** */
11 11
 namespace Organizations\Repository\Event;
Please login to merge, or discard this patch.
module/Install/src/Controller/Plugin/YawikConfigCreator.php 1 patch
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * YAWIK
4
- *
5
- * @filesource
6
- * @license    MIT
7
- * @copyright  2013 - 2015 Cross Solution <http://cross-solution.de>
8
- */
3
+     * YAWIK
4
+     *
5
+     * @filesource
6
+     * @license    MIT
7
+     * @copyright  2013 - 2015 Cross Solution <http://cross-solution.de>
8
+     */
9 9
 
10 10
 /** */
11 11
 namespace Install\Controller\Plugin;
@@ -93,8 +93,8 @@  discard block
 block discarded – undo
93 93
         // Create a file with the class/file map.
94 94
         // Stupid syntax highlighters make separating < from PHP declaration necessary
95 95
         $content = '<' . "?php\n"
96
-                   . "\n"
97
-                   . 'return ' . var_export($config, true) . ';';
96
+                    . "\n"
97
+                    . 'return ' . var_export($config, true) . ';';
98 98
 
99 99
         // Fix \' strings from injected DIRECTORY_SEPARATOR usage in iterator_apply op
100 100
         $content = str_replace("\\'", "'", $content);
Please login to merge, or discard this patch.
module/Install/src/Form/Installation.php 1 patch
Indentation   +37 added lines, -37 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * YAWIK
4
- *
5
- * @filesource
6
- * @license    MIT
7
- * @copyright  2013 - 2015 Cross Solution <http://cross-solution.de>
8
- */
3
+     * YAWIK
4
+     *
5
+     * @filesource
6
+     * @license    MIT
7
+     * @copyright  2013 - 2015 Cross Solution <http://cross-solution.de>
8
+     */
9 9
 
10 10
 /** */
11 11
 namespace Install\Form;
@@ -27,53 +27,53 @@  discard block
 block discarded – undo
27 27
         $this->setName('installation');
28 28
         $this->setAttributes(
29 29
             array(
30
-                                 'method' => 'post',
31
-                                 'action' => '?p=install'
32
-                             )
30
+                                    'method' => 'post',
31
+                                    'action' => '?p=install'
32
+                                )
33 33
         );
34 34
 
35 35
         $this->add(
36 36
             array(
37
-                       'type'       => 'Text',
38
-                       'name'       => 'db_conn',
39
-                       'options'    => array(
40
-                           'label' => /* @translate */ 'Database connection string',
41
-                       ),
42
-                       'attributes' => array(
43
-                           'placeholder' => 'mongodb://localhost:27017/YAWIK',
44
-                       ),
37
+                        'type'       => 'Text',
38
+                        'name'       => 'db_conn',
39
+                        'options'    => array(
40
+                            'label' => /* @translate */ 'Database connection string',
41
+                        ),
42
+                        'attributes' => array(
43
+                            'placeholder' => 'mongodb://localhost:27017/YAWIK',
44
+                        ),
45 45
 
46
-                   )
46
+                    )
47 47
         );
48 48
 
49 49
         $this->add(
50 50
             array(
51
-                       'type'    => 'Text',
52
-                       'name'    => 'username',
53
-                       'options' => array(
54
-                           'label' => /* @translate */ 'Initial user name',
55
-                       ),
56
-                   )
51
+                        'type'    => 'Text',
52
+                        'name'    => 'username',
53
+                        'options' => array(
54
+                            'label' => /* @translate */ 'Initial user name',
55
+                        ),
56
+                    )
57 57
         );
58 58
 
59 59
         $this->add(
60 60
             array(
61
-                       'type'    => 'Password',
62
-                       'name'    => 'password',
63
-                       'options' => array(
64
-                           'label' => /* @translate */ 'Password',
65
-                       ),
66
-                   )
61
+                        'type'    => 'Password',
62
+                        'name'    => 'password',
63
+                        'options' => array(
64
+                            'label' => /* @translate */ 'Password',
65
+                        ),
66
+                    )
67 67
         );
68 68
 
69 69
         $this->add(
70 70
             array(
71
-                       'type' => 'Text',
72
-                       'name' => 'email',
73
-                       'options' => array(
74
-                           'label' => /* @translate */ 'Email address for system messages',
75
-                       ),
76
-                   )
71
+                        'type' => 'Text',
72
+                        'name' => 'email',
73
+                        'options' => array(
74
+                            'label' => /* @translate */ 'Email address for system messages',
75
+                        ),
76
+                    )
77 77
         );
78 78
     }
79 79
 
@@ -88,7 +88,7 @@  discard block
 block discarded – undo
88 88
                 ),
89 89
                 'validators'        => array(
90 90
                     array('name' => 'Install/ConnectionString',
91
-                          'break_chain_on_failure' => true),
91
+                            'break_chain_on_failure' => true),
92 92
                     array('name' => 'Install/Connection'),
93 93
                 ),
94 94
             ),
Please login to merge, or discard this patch.
module/Install/src/Validator/MongoDbConnectionString.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@
 block discarded – undo
21 21
  */
22 22
 class MongoDbConnectionString extends AbstractValidator
23 23
 {
24
-    const INVALID       = 'invalidConnectionString';
24
+    const INVALID = 'invalidConnectionString';
25 25
 
26 26
     /**
27 27
      * Options
Please login to merge, or discard this patch.
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * YAWIK
4
- *
5
- * @filesource
6
- * @license    MIT
7
- * @copyright  2013 - 2015 Cross Solution <http://cross-solution.de>
8
- */
3
+     * YAWIK
4
+     *
5
+     * @filesource
6
+     * @license    MIT
7
+     * @copyright  2013 - 2015 Cross Solution <http://cross-solution.de>
8
+     */
9 9
 
10 10
 /** */
11 11
 namespace Organizations\Form\Element;
Please login to merge, or discard this patch.
module/Install/src/autoload_classmap.php 1 patch
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -1,15 +1,15 @@
 block discarded – undo
1 1
 <?php
2 2
 // Generated by ZF2's ./bin/classmap_generator.php
3 3
 return array(
4
-  'Install\Filter\DbNameExtractor'                              => __DIR__ . '/Filter/DbNameExtractor.php',
5
-  'Install\Form\Installation'                                   => __DIR__ . '/Form/Installation.php',
6
-  'Install\Controller\Index'                                    => __DIR__ . '/Controller/Index.php',
7
-  'Install\Controller\Plugin\Prerequisites'                     => __DIR__ . '/Controller/Plugin/Prerequisites.php',
8
-  'Install\Controller\Plugin\YawikConfigCreator'                => __DIR__ . '/Controller/Plugin/YawikConfigCreator.php',
9
-  'Install\Controller\Plugin\UserCreator'                       => __DIR__ . '/Controller/Plugin/UserCreator.php',
10
-  'Install\Listener\LanguageSetter'                             => __DIR__ . '/Listener/LanguageSetter.php',
11
-  'Install\Validator\MongoDbConnection'                         => __DIR__ . '/Validator/MongoDbConnection.php',
12
-  'Install\Validator\MongoDbConnectionString'                   => __DIR__ . '/Validator/MongoDbConnectionString.php',
13
-  'Install\Factory\Controller\Plugin\UserCreatorFactory'        => __DIR__ . '/Factory/Controller/Plugin/UserCreatorFactory.php',
14
-  'Install\Factory\Controller\Plugin\YawikConfigCreatorFactory' => __DIR__ . '/Factory/Controller/Plugin/YawikConfigCreatorFactory.php',
4
+    'Install\Filter\DbNameExtractor'                              => __DIR__ . '/Filter/DbNameExtractor.php',
5
+    'Install\Form\Installation'                                   => __DIR__ . '/Form/Installation.php',
6
+    'Install\Controller\Index'                                    => __DIR__ . '/Controller/Index.php',
7
+    'Install\Controller\Plugin\Prerequisites'                     => __DIR__ . '/Controller/Plugin/Prerequisites.php',
8
+    'Install\Controller\Plugin\YawikConfigCreator'                => __DIR__ . '/Controller/Plugin/YawikConfigCreator.php',
9
+    'Install\Controller\Plugin\UserCreator'                       => __DIR__ . '/Controller/Plugin/UserCreator.php',
10
+    'Install\Listener\LanguageSetter'                             => __DIR__ . '/Listener/LanguageSetter.php',
11
+    'Install\Validator\MongoDbConnection'                         => __DIR__ . '/Validator/MongoDbConnection.php',
12
+    'Install\Validator\MongoDbConnectionString'                   => __DIR__ . '/Validator/MongoDbConnectionString.php',
13
+    'Install\Factory\Controller\Plugin\UserCreatorFactory'        => __DIR__ . '/Factory/Controller/Plugin/UserCreatorFactory.php',
14
+    'Install\Factory\Controller\Plugin\YawikConfigCreatorFactory' => __DIR__ . '/Factory/Controller/Plugin/YawikConfigCreatorFactory.php',
15 15
 );
Please login to merge, or discard this patch.