|  | @@ -118,7 +118,7 @@  discard block | 
                                                    
                                                        |  |  |  block discarded – undo | 
                                                                                                                                                                                                                    
                                                            | 118 | 118 |          /** @var \DateTime $startDateTime */ | 
                                                                                                            
                                                            | 119 | 119 |          $startDateTime = $configuration['timePeriod']['start']; | 
                                                                                                            
                                                            | 120 | 120 |          /** @var \DateTime $endDateTime */ | 
                                                                                                            
                                                            | 121 |  | -        $endDateTime = $configuration['timePeriod']['end']?:new \DateTime(); | 
                                                                                                            
                                                            |  | 121 | +        $endDateTime = $configuration['timePeriod']['end'] ?: new \DateTime(); | 
                                                                                                            
                                                            | 122 | 122 |   | 
                                                                                                            
                                                            | 123 | 123 |          $this->qb | 
                                                                                                            
                                                            | 124 | 124 |              ->addSelect($groupByParts[0]) | 
                                                                                                                                                        
                                                        |  | @@ -211,7 +211,7 @@  discard block | 
                                                    
                                                        |  |  |  block discarded – undo | 
                                                                                                                                                                                                                    
                                                            | 211 | 211 |          $type = 'user'.ucfirst($addressType).'Province'; | 
                                                                                                            
                                                            | 212 | 212 |   | 
                                                                                                            
                                                            | 213 | 213 |          if (isset($configuration[$type]) && count($configuration[$type]) > 0) { | 
                                                                                                            
                                                            | 214 |  | -            $provinces = $configuration[$type]->map(function (AddressInterface $address) { | 
                                                                                                            
                                                            |  | 214 | +            $provinces = $configuration[$type]->map(function(AddressInterface $address) { | 
                                                                                                            
                                                            | 215 | 215 |                  return $address->getProvinceCode() ?: $address->getProvinceName(); | 
                                                                                                            
                                                            | 216 | 216 |              })->toArray(); | 
                                                                                                            
                                                            | 217 | 217 |              $rootAlias = $cAlias = $this->qb->getRootAliases()[0]; | 
                                                                                                                                                        
                                                        |  | @@ -240,7 +240,7 @@  discard block | 
                                                    
                                                        |  |  |  block discarded – undo | 
                                                                                                                                                                                                                    
                                                            | 240 | 240 |          $type = 'user'.ucfirst($addressType).'City'; | 
                                                                                                            
                                                            | 241 | 241 |   | 
                                                                                                            
                                                            | 242 | 242 |          if (isset($configuration[$type]) && count($configuration[$type]) > 0) { | 
                                                                                                            
                                                            | 243 |  | -            $cities = $configuration[$type]->map(function (AddressInterface $address) { | 
                                                                                                            
                                                            |  | 243 | +            $cities = $configuration[$type]->map(function(AddressInterface $address) { | 
                                                                                                            
                                                            | 244 | 244 |                  return $address->getCity(); | 
                                                                                                            
                                                            | 245 | 245 |              })->toArray(); | 
                                                                                                            
                                                            | 246 | 246 |              $rootAlias = $cAlias = $this->qb->getRootAliases()[0]; | 
                                                                                                                                                        
                                                        |  | @@ -266,7 +266,7 @@  discard block | 
                                                    
                                                        |  |  |  block discarded – undo | 
                                                                                                                                                                                                                    
                                                            | 266 | 266 |          $type = 'user'.ucfirst($addressType).'Postcode'; | 
                                                                                                            
                                                            | 267 | 267 |   | 
                                                                                                            
                                                            | 268 | 268 |          if (isset($configuration[$type]) && count($configuration[$type]) > 0) { | 
                                                                                                            
                                                            | 269 |  | -            $codes = $configuration[$type]->map(function (AddressInterface $address) { | 
                                                                                                            
                                                            |  | 269 | +            $codes = $configuration[$type]->map(function(AddressInterface $address) { | 
                                                                                                            
                                                            | 270 | 270 |                  return $address->getPostcode(); | 
                                                                                                            
                                                            | 271 | 271 |              })->toArray(); | 
                                                                                                            
                                                            | 272 | 272 |              $rootAlias = $cAlias = $this->qb->getRootAliases()[0]; |