cross-solution / YAWIK

module/Jobs/src/Jobs/Controller/ConsoleController.php

Spacing +12 added lines, -12 removed lines

@@ -55,9 +55,9 @@ 
         }
 
         $date = new \DateTime('today');
-        $date->sub(new \DateInterval('P' . $days . 'D'));
+        $date->sub(new \DateInterval('P'.$days.'D'));
 
-        $query        = [
+        $query = [
             '$and' => [
                 ['status.name' => StatusInterface::ACTIVE],
                 ['$or' => [
@@ -73,7 +73,7 @@ 
 
         $offset = 0;
         if ($limit && false !== strpos($limit, ',')) {
-            list($limit,$offset) = explode(',', $limit);
+            list($limit, $offset) = explode(',', $limit);
         }
 
         $jobs = $jobsRepo->findBy($query, null, (int) $limit, (int) $offset);
@@ -84,9 +84,9 @@ 
         }
 
         if ($info) {
-            echo count($jobs) , ' Jobs';
-            if ($offset) { echo ' starting from ' . $offset; }
-            echo PHP_EOL . PHP_EOL;
+            echo count($jobs), ' Jobs';
+            if ($offset) { echo ' starting from '.$offset; }
+            echo PHP_EOL.PHP_EOL;
             $this->listExpiredJobs($jobs);
             return;
         }
@@ -98,7 +98,7 @@ 
         
         echo "$count jobs found, which have to expire ...\n";
         
-        $progress     = new ProgressBar(
+        $progress = new ProgressBar(
             new ConsoleAdapter(
                 array(
                 'elements' => array(
@@ -121,7 +121,7 @@ 
 
         /* @var \Jobs\Entity\Job $job */
         foreach ($jobs as $job) {
-            $progress->update($i++, 'Job ' . $i . ' / ' . $count);
+            $progress->update($i++, 'Job '.$i.' / '.$count);
 
             $job->changeStatus('expired');
 
@@ -149,7 +149,7 @@ 
         $i            = 0;
         /* @var Job $job */
         foreach ($jobs as $job) {
-            $progress->update($i++, 'Job ' . $i . ' / ' . $count);
+            $progress->update($i++, 'Job '.$i.' / '.$count);
             
             $permissions = $job->getPermissions();
             $user        = $job->getUser();
@@ -157,7 +157,7 @@ 
                 continue;
             }
             try {
-                $group       = $user->getGroup($job->getCompany());
+                $group = $user->getGroup($job->getCompany());
             } catch (\Exception $e) {
                 continue;
             }
@@ -196,7 +196,7 @@ 
                 $org = $job->getCompany();
             }
             printf(
-                '%s   %s   %s   %-30s   %-20s' . PHP_EOL,
+                '%s   %s   %s   %-30s   %-20s'.PHP_EOL,
                 $id,
                 $job->getDatePublishStart()->format('Y-m-d'),
                 $job->getDatePublishEnd()->format('Y-m-d'),
@@ -204,6 +204,6 @@ 
                 substr($org, 0, 20)
             );
         }
-        return count($jobs) . ' Jobs.';
+        return count($jobs).' Jobs.';
     }
 }

module/Core/src/Core/Controller/Plugin/PaginationBuilder.php

Spacing +3 added lines, -3 removed lines

@@ -78,7 +78,7 @@ 
         }
 
         if (!is_array($stack)) {
-            throw new \InvalidArgumentException('Expected argument to be of type array, but received ' . gettype($stack));
+            throw new \InvalidArgumentException('Expected argument to be of type array, but received '.gettype($stack));
         }
 
         $stack = array_intersect_key($stack, ['params' => true, 'form' => true, 'paginator' => true]);
@@ -147,7 +147,7 @@ 
      *
      * @return self
      */
-    public function params($namespace, $defaults = [ 'page' => 1 ])
+    public function params($namespace, $defaults = ['page' => 1])
     {
         $this->stack['params'] = [$namespace, $defaults];
         return $this;
@@ -242,7 +242,7 @@ 
                         $queryArray[$match['name']][$v] = 1;
                     }
                 } else {
-                    $queryArray[ $match[ 'name' ] ] = $value;
+                    $queryArray[$match['name']] = $value;
                 }
                 unset($queryArray[$key]);
             }

module/Jobs/config/module.config.php

Spacing +43 added lines, -43 removed lines

@@ -21,7 +21,7 @@ 
                  * for multiple paths.
                  * example https://github.com/doctrine/DoctrineORMModule
                  */
-                'paths' => [ __DIR__ . '/../src/Jobs/Entity'],
+                'paths' => [__DIR__.'/../src/Jobs/Entity'],
             ],
         ],
         'eventmanager' => [
@@ -34,8 +34,8 @@ 
     ],
 
     'options' => [
-        'Jobs/JobboardSearchOptions' => [ 'class' => '\Jobs\Options\JobboardSearchOptions' ],
-        'Jobs/BaseFieldsetOptions' => [ 'class' => '\Jobs\Options\BaseFieldsetOptions' ],
+        'Jobs/JobboardSearchOptions' => ['class' => '\Jobs\Options\JobboardSearchOptions'],
+        'Jobs/BaseFieldsetOptions' => ['class' => '\Jobs\Options\BaseFieldsetOptions'],
     ],
 
     'Jobs' => [
@@ -57,7 +57,7 @@ 
             'translation_file_patterns' => [
                     [
                             'type'     => 'gettext',
-                            'base_dir' => __DIR__ . '/../language',
+                            'base_dir' => __DIR__.'/../language',
                             'pattern'  => '%s.mo',
                     ],
             ],
@@ -97,7 +97,7 @@ 
                     'Jobboard',
                     'Jobs/Jobboard',
                     'Jobs/ApiJobListByChannel',
-                    'Jobs/Template' => [ 'view', 'edittemplate' ],
+                    'Jobs/Template' => ['view', 'edittemplate'],
                     'Jobs/Manage' => [
                         'template',
                     ],
@@ -222,7 +222,7 @@ 
             'Jobs/Listener/AdminWidgetProvider'           => 'Jobs\Factory\Listener\AdminWidgetProviderFactory',
             'Jobs/ViewModelTemplateFilter'                => 'Jobs\Factory\Filter\ViewModelTemplateFilterFactory',
             'Jobs\Model\ApiJobDehydrator'                 => 'Jobs\Factory\Model\ApiJobDehydratorFactory',
-            'Jobs/Listener/Publisher'                     => [Publisher::class,'factory'],
+            'Jobs/Listener/Publisher'                     => [Publisher::class, 'factory'],
             'Jobs/PreviewLinkHydrator'                    => 'Jobs\Form\Hydrator\PreviewLinkHydrator::factory',
             'Jobs\Auth\Dependency\ListListener'           => 'Jobs\Factory\Auth\Dependency\ListListenerFactory',
             'Jobs/DefaultCategoriesBuilder'              => 'Jobs\Factory\Repository\DefaultCategoriesBuilderFactory',
@@ -239,7 +239,7 @@ 
 
 
     'event_manager' => [
-        'Core/AdminController/Events' => [ 'listeners' => [
+        'Core/AdminController/Events' => ['listeners' => [
             'Jobs/Listener/AdminWidgetProvider' => \Core\Controller\AdminControllerEvent::EVENT_DASHBOARD,
         ]],
 
@@ -261,7 +261,7 @@ 
         'Core/Ajax/Events' => ['listeners' => [
             \Jobs\Listener\DeleteJob::class => ['jobs.delete', true],
             \Jobs\Listener\GetOrganizationManagers::class => ['jobs.manager-select', true],
-            \Jobs\Listener\LoadActiveOrganizations::class => [ 'jobs.admin.activeorganizations', true],
+            \Jobs\Listener\LoadActiveOrganizations::class => ['jobs.admin.activeorganizations', true],
 
         ]],
     ],
@@ -273,10 +273,10 @@ 
             'Jobs/ApiJobListByChannel' => 'Jobs\Controller\ApiJobListByChannelController',
         ],
         'factories' => [
-            'Jobs/Import' => [ Controller\ImportController::class, 'factory'],
-        	'Jobs/Console' => [ConsoleController::class,'factory'],
-	        'Jobs/AdminCategories' => [AdminCategoriesController::class,'factory'],
-	        'Jobs/Admin'      => [AdminController::class,'factory'],
+            'Jobs/Import' => [Controller\ImportController::class, 'factory'],
+        	'Jobs/Console' => [ConsoleController::class, 'factory'],
+	        'Jobs/AdminCategories' => [AdminCategoriesController::class, 'factory'],
+	        'Jobs/Admin'      => [AdminController::class, 'factory'],
             'Jobs/Template' => 'Jobs\Factory\Controller\TemplateControllerFactory',
             'Jobs/Index' => 'Jobs\Factory\Controller\IndexControllerFactory',
             'Jobs/Approval' => 'Jobs\Factory\Controller\ApprovalControllerFactory',
@@ -309,41 +309,41 @@ 
     'view_manager' => [
         // Map template to files. Speeds up the lookup through the template stack.
         'template_map' => [
-            'jobs/form/list-filter' => __DIR__ . '/../view/form/list-filter.phtml',
-            'jobs/form/apply-identifier' => __DIR__ . '/../view/form/apply-identifier.phtml',
-            'jobs/form/hiring-organization-select' => __DIR__ . '/../view/form/hiring-organization-select.phtml',
-            'jobs/form/multiposting-select' => __DIR__ . '/../view/form/multiposting-select.phtml',
-            'jobs/form/multiposting-checkboxes' => __DIR__ . '/../view/form/multiposting-checkboxes.phtml',
-            'jobs/form/ats-mode.view' => __DIR__ . '/../view/form/ats-mode.view.phtml',
-            'jobs/form/ats-mode.form' => __DIR__ . '/../view/form/ats-mode.form.phtml',
-            'jobs/form/company-name-fieldset' => __DIR__ . '/../view/form/company-name-fieldset.phtml',
-            'jobs/form/preview' => __DIR__ . '/../view/form/preview.phtml',
-            'jobs/form/customer-note' => __DIR__ . '/../view/form/customer-note.phtml',
-            'jobs/partials/channel-list' => __DIR__ . '/../view/partials/channel-list.phtml',
-            'jobs/assign-user' => __DIR__ . '/../view/jobs/manage/assign-user.phtml',
-            'jobs/snapshot_or_preview' => __DIR__ . '/../view/partials/snapshot_or_preview.phtml',
-            'jobs/history' => __DIR__ . '/../view/partials/history.phtml',
-            'jobs/portalsummary' => __DIR__ . '/../view/partials/portalsummary.phtml',
-            'content/jobs-publish-on-yawik' => __DIR__ . '/../view/modals/yawik.phtml',
-            'content/jobs-publish-on-jobsintown' => __DIR__ . '/../view/modals/jobsintown.phtml',
-            'content/jobs-publish-on-homepage' => __DIR__ . '/../view/modals/homepage.phtml',
-            'content/jobs-publish-on-fazjob' => __DIR__ . '/../view/modals/fazjob.phtml',
-            'content/jobs-terms-and-conditions' => __DIR__ . '/../view/jobs/index/terms.phtml',
-            'mail/job-created' => __DIR__ . '/../view/mails/job-created.phtml',
-            'mail/job-pending' => __DIR__ . '/../view/mails/job-pending.phtml',
-            'mail/job-accepted' => __DIR__ . '/../view/mails/job-accepted.phtml',
-            'mail/job-rejected' => __DIR__ . '/../view/mails/job-rejected.phtml',
-            'mail/job-created.en' => __DIR__ . '/../view/mails/job-created.en.phtml',
-            'mail/job-pending.en' => __DIR__ . '/../view/mails/job-pending.en.phtml',
-            'mail/job-accepted.en' => __DIR__ . '/../view/mails/job-accepted.en.phtml',
-            'mail/job-rejected.en' => __DIR__ . '/../view/mails/job-rejected.en.phtml',
-            'jobs/error/no-parent' => __DIR__ . '/../view/error/no-parent.phtml',
-            'jobs/error/expired' => __DIR__ . '/../view/error/expired.phtml',
+            'jobs/form/list-filter' => __DIR__.'/../view/form/list-filter.phtml',
+            'jobs/form/apply-identifier' => __DIR__.'/../view/form/apply-identifier.phtml',
+            'jobs/form/hiring-organization-select' => __DIR__.'/../view/form/hiring-organization-select.phtml',
+            'jobs/form/multiposting-select' => __DIR__.'/../view/form/multiposting-select.phtml',
+            'jobs/form/multiposting-checkboxes' => __DIR__.'/../view/form/multiposting-checkboxes.phtml',
+            'jobs/form/ats-mode.view' => __DIR__.'/../view/form/ats-mode.view.phtml',
+            'jobs/form/ats-mode.form' => __DIR__.'/../view/form/ats-mode.form.phtml',
+            'jobs/form/company-name-fieldset' => __DIR__.'/../view/form/company-name-fieldset.phtml',
+            'jobs/form/preview' => __DIR__.'/../view/form/preview.phtml',
+            'jobs/form/customer-note' => __DIR__.'/../view/form/customer-note.phtml',
+            'jobs/partials/channel-list' => __DIR__.'/../view/partials/channel-list.phtml',
+            'jobs/assign-user' => __DIR__.'/../view/jobs/manage/assign-user.phtml',
+            'jobs/snapshot_or_preview' => __DIR__.'/../view/partials/snapshot_or_preview.phtml',
+            'jobs/history' => __DIR__.'/../view/partials/history.phtml',
+            'jobs/portalsummary' => __DIR__.'/../view/partials/portalsummary.phtml',
+            'content/jobs-publish-on-yawik' => __DIR__.'/../view/modals/yawik.phtml',
+            'content/jobs-publish-on-jobsintown' => __DIR__.'/../view/modals/jobsintown.phtml',
+            'content/jobs-publish-on-homepage' => __DIR__.'/../view/modals/homepage.phtml',
+            'content/jobs-publish-on-fazjob' => __DIR__.'/../view/modals/fazjob.phtml',
+            'content/jobs-terms-and-conditions' => __DIR__.'/../view/jobs/index/terms.phtml',
+            'mail/job-created' => __DIR__.'/../view/mails/job-created.phtml',
+            'mail/job-pending' => __DIR__.'/../view/mails/job-pending.phtml',
+            'mail/job-accepted' => __DIR__.'/../view/mails/job-accepted.phtml',
+            'mail/job-rejected' => __DIR__.'/../view/mails/job-rejected.phtml',
+            'mail/job-created.en' => __DIR__.'/../view/mails/job-created.en.phtml',
+            'mail/job-pending.en' => __DIR__.'/../view/mails/job-pending.en.phtml',
+            'mail/job-accepted.en' => __DIR__.'/../view/mails/job-accepted.en.phtml',
+            'mail/job-rejected.en' => __DIR__.'/../view/mails/job-rejected.en.phtml',
+            'jobs/error/no-parent' => __DIR__.'/../view/error/no-parent.phtml',
+            'jobs/error/expired' => __DIR__.'/../view/error/expired.phtml',
         ],
 
         // Where to look for view templates not mapped above
         'template_path_stack' => [
-            __DIR__ . '/../view',
+            __DIR__.'/../view',
         ],
     ],
 

module/Jobs/src/Jobs/Controller/ImportController.php

Spacing +8 added lines, -8 removed lines

@@ -84,7 +84,7 @@ 
                         $entity = $repositoriesJob->findOneBy(array("applyId" => (string) $applyId));
                         if (!isset($entity)) {
                             // new Job (the more likely branch)
-                            $entity =$repositoriesJob->create(array("applyId" => (string) $applyId));
+                            $entity = $repositoriesJob->create(array("applyId" => (string) $applyId));
                         } else {
                             $createdJob = false;
                         }
@@ -130,10 +130,10 @@ 
                             $entity->getPermissions()->grant($group, PermissionsInterface::PERMISSION_VIEW);
                         }
                         $result['isSaved'] = true;
-                        $log->info('Jobs/manage/saveJob [user: ' . $user->getLogin() . ']:' . var_export($p, true));
+                        $log->info('Jobs/manage/saveJob [user: '.$user->getLogin().']:'.var_export($p, true));
 
                         if (!empty($params->companyId)) {
-                            $companyId                = $params->companyId . $loginSuffix;
+                            $companyId                = $params->companyId.$loginSuffix;
                             $repOrganization          = $repositories->get('Organizations/Organization');
                             $hydratorManager          = $services->get('HydratorManager');
                             /* @var \Organizations\Entity\Hydrator\OrganizationHydrator $hydrator */
@@ -189,7 +189,7 @@ 
                             $jobLocations->clear();
                             foreach ($locations as $locData) {
                                 $location = new Location();
-                                $coords = array_map(function ($i) { return (float) $i; }, $locData['coordinates']);
+                                $coords = array_map(function($i) { return (float) $i; }, $locData['coordinates']);
                                 $location->setCountry($locData['country'])
                                          ->setRegion($locData['region'])
                                          ->setCity($locData['city'])
@@ -254,7 +254,7 @@ 
                                                     break;
                                             }
                                             if (array_key_exists($portal, $result['portals'])) {
-                                                throw new \RuntimeException('Publisher-Events (internal error): There are two publisher registered for ' . $portal);
+                                                throw new \RuntimeException('Publisher-Events (internal error): There are two publisher registered for '.$portal);
                                             }
                                             $result['portals'][$portal] = $status;
                                         } else {
@@ -267,16 +267,16 @@ 
                             }
                         }
                     } else {
-                        $log->info('Jobs/manage/saveJob [error: ' . $form->getMessages() . ']:' . var_export($p, true));
+                        $log->info('Jobs/manage/saveJob [error: '.$form->getMessages().']:'.var_export($p, true));
                         $result['valid Error'] = $form->getMessages();
                     }
                 }
             } else {
-                $log->info('Jobs/manage/saveJob [error: session lost]:' . var_export($p, true));
+                $log->info('Jobs/manage/saveJob [error: session lost]:'.var_export($p, true));
                 $result['message'] = 'session_id is lost';
             }
         } catch (\Exception $e) {
-            $result['message'] = 'exception occured: ' . $e->getMessage();
+            $result['message'] = 'exception occured: '.$e->getMessage();
         }
         //$services->get('Core/Log')->info('Jobs/manage/saveJob result:' . PHP_EOL . var_export($p, True));
         return new JsonModel($result);

module/Core/src/Core/Form/View/Helper/SearchForm.php

Spacing +12 added lines, -12 removed lines

@@ -35,7 +35,7 @@ 
      * @param array $colMap
      * @return Form|string
      */
-    public function __invoke(FormInterface $form = null, $colMap=null)
+    public function __invoke(FormInterface $form = null, $colMap = null)
     {
         if (!$form) {
             return $this;
@@ -44,7 +44,7 @@ 
         return $this->render($form, $colMap);
     }
 
-    public function render(FormInterface $form, $colMap=null, $buttonsSpan = null)
+    public function render(FormInterface $form, $colMap = null, $buttonsSpan = null)
     {
         $headscript = $this->getView()->plugin('headscript');
         $basepath   = $this->getView()->plugin('basepath');
@@ -61,14 +61,14 @@ 
         $form->prepare();
 
         if ($form instanceOf ViewPartialProviderInterface) {
-            return $this->getView()->partial($form->getViewPartial(), [ 'element' => $form, 'colMap' => $colMap, 'buttonsSpan' => $buttonsSpan ]);
+            return $this->getView()->partial($form->getViewPartial(), ['element' => $form, 'colMap' => $colMap, 'buttonsSpan' => $buttonsSpan]);
         }
 
         $content = $this->renderElements($form, $colMap, $buttonsSpan);
 
         return $this->openTag($form)
              . '<div class="row" style="padding: 0 15px;">'
-             . $content . '</div>' . $this->closeTag();
+             . $content.'</div>'.$this->closeTag();
 
     }
 
@@ -81,7 +81,7 @@ 
             $button->removeAttribute('name');
             $attrs = $helper->createAttributesString($button->getAttributes());
 
-            $content.= '<button ' . $attrs . '>'
+            $content .= '<button '.$attrs.'>'
                        . $this->getTranslator()->translate($button->getLabel(), $this->getTranslatorTextDomain())
                        . '</button>';
         }
@@ -92,7 +92,7 @@ 
     public function renderElements($form, $colMap = null, $buttonsSpan = null)
     {
         if ($form instanceOf ViewPartialProviderInterface) {
-            return $this->getView()->partial($form->getViewPartial(), [ 'element' => $form, 'colMap' => $colMap, 'buttonsSpan' => $buttonsSpan ]);
+            return $this->getView()->partial($form->getViewPartial(), ['element' => $form, 'colMap' => $colMap, 'buttonsSpan' => $buttonsSpan]);
         }
 
         if (null === $colMap) {
@@ -100,7 +100,7 @@ 
         }
 
         $formElement = $this->getView()->plugin('formElement');
-        $content = ''; $buttonsRendered = false; $i=0;
+        $content = ''; $buttonsRendered = false; $i = 0;
         foreach ($form as $element) {
 
             if ($element instanceOf Hidden) {
@@ -119,14 +119,14 @@ 
             }
 
             if ($element->getName() == $form->getButtonElement()) {
-                $content.='<div class="input-group col-md-' . $cols . '">'
+                $content .= '<div class="input-group col-md-'.$cols.'">'
                               . $formElement($element)
                               . '<div class="input-group-btn search-form-buttons" style="width: 1px;">'
-                              . $this->renderButtons($form->getButtons()) . '</div>'
+                              . $this->renderButtons($form->getButtons()).'</div>'
                               . '</div>';
                 $buttonsRendered = true;
             } else {
-                $content .= '<div class="input-group col-md-' . $cols . '">'
+                $content .= '<div class="input-group col-md-'.$cols.'">'
                           . $formElement($element)
                           . '</div>';
             }
@@ -138,8 +138,8 @@ 
             if (null === $buttonsSpan) {
                 $buttonsSpan = $form->getOption('buttons_span') ?: 12;
             }
-            $content .= '<div class="input-group search-form-buttons col-md-' . $buttonsSpan . ' text-right">'
-                      . '<div class="btn-group">' . $this->renderButtons($form->getButtons()) .'</div></div>';
+            $content .= '<div class="input-group search-form-buttons col-md-'.$buttonsSpan.' text-right">'
+                      . '<div class="btn-group">'.$this->renderButtons($form->getButtons()).'</div></div>';
         }
 
         return $content;

module/Jobs/src/Jobs/Listener/Events/JobEvent.php

Spacing +3 added lines, -3 removed lines

@@ -33,13 +33,13 @@ 
      * Event is fired when a users has created a new job opening and accepted the
      * terms and conditions
      */
-    const EVENT_JOB_CREATED   = 'job.created';
+    const EVENT_JOB_CREATED = 'job.created';
 
     /**
      * Event is fired when the owner of the YAWIK installation has accepted the job
      * opening
      */
-    const EVENT_JOB_ACCEPTED   = 'job.accepted';
+    const EVENT_JOB_ACCEPTED = 'job.accepted';
 
     /**
      * Event is fired, when the owner of the YAWIK installation has rejected the job
@@ -55,7 +55,7 @@ 
     /**
      * get all available names for publishing
      */
-    const PORTAL_AVAIL_NAME    = 'portal.availname';
+    const PORTAL_AVAIL_NAME = 'portal.availname';
 
     /**
      * portals to be published

module/Core/src/Core/Entity/Tree/Node.php

Spacing +1 added lines, -1 removed lines

@@ -153,7 +153,7 @@
 
     public function getValueWithParents($withRoot = false, $useNames = false)
     {
-        $parts = [ ($useNames ? $this->getName() : $this->getValue()) ];
+        $parts = [($useNames ? $this->getName() : $this->getValue())];
         $item = $this;
 
         while ($item = $item->getParent()) {

module/Core/src/Core/Form/Hydrator/Strategy/TreeSelectStrategy.php

Spacing +1 added lines, -1 removed lines

@@ -222,7 +222,7 @@
      */
     private function findLeaf(NodeInterface $leaf, $value)
     {
-        $parts = is_array($value) ? $value : explode($this->shouldUseNames() ? ' | ': '-', $value);
+        $parts = is_array($value) ? $value : explode($this->shouldUseNames() ? ' | ' : '-', $value);
         $value = array_shift($parts);
 
         /* @var NodeInterface $item */

module/Core/src/Core/Entity/AbstractLocation.php

Spacing +6 added lines, -6 removed lines

@@ -90,14 +90,14 @@ 
         
         $str = '';
         if ($street) { $str .= $street; if (!$number) { $str .= ', '; } }
-        if ($number) { $str .= ' ' . $number . ', '; }
-        if ($postalCode) { $str .= $postalCode . ' '; }
+        if ($number) { $str .= ' '.$number.', '; }
+        if ($postalCode) { $str .= $postalCode.' '; }
         if ($city) { $str .= $city; }
-        if ($region) { $str .= ', ' . $region; }
-        if ($country) { $str .= ', ' . $country; }
+        if ($region) { $str .= ', '.$region; }
+        if ($country) { $str .= ', '.$country; }
         if ($coords) {
             $coords = $coords->getCoordinates();
-            $str .= ' ( ' . join(', ', $coords) . ' )';
+            $str .= ' ( '.join(', ', $coords).' )';
         }
         
         return $str;
@@ -138,7 +138,7 @@ 
             if (!$value) { continue; }
 
             if ('coordinates' == $key) {
-                $class = '\\Geo\\Entity\\Geometry\\' . $value['type'];
+                $class = '\\Geo\\Entity\\Geometry\\'.$value['type'];
                 $value = new $class($value['coordinates']);
             }