Composer migrate deps

Domain/PaymentGateway.php

@@ -1,9 +1,9 @@
 <?php
 
 if (file_exists(ROOT_DIR . 'vendor/autoload.php')) {
-  require_once ROOT_DIR . 'vendor/autoload.php';
+    require_once ROOT_DIR . 'vendor/autoload.php';
 }
-require ROOT_DIR . 'lib/external/Unirest/Unirest.php';
+
 
 class PaymentGateways
 {
@@ -254,9 +254,9 @@ public function IsEnabled()
     public function Settings()
     {
         return [
-                new PaymentGatewaySetting(self::CLIENT_ID, $this->ClientId()),
-                new PaymentGatewaySetting(self::SECRET, $this->Secret()),
-                new PaymentGatewaySetting(self::ENVIRONMENT, $this->Environment()),
+            new PaymentGatewaySetting(self::CLIENT_ID, $this->ClientId()),
+            new PaymentGatewaySetting(self::SECRET, $this->Secret()),
+            new PaymentGatewaySetting(self::ENVIRONMENT, $this->Environment()),
         ];
     }
 
@@ -302,7 +302,7 @@ private function GetBaseUrl()
         $baseUrl = "https://api.paypal.com";
         $paypalEnvironment = $this->Environment();
         if (strtolower($paypalEnvironment) == "sandbox") {
-            $baseUrl = "https://api.sandbox.paypal.com";
+            $baseUrl = "https://api-m.sandbox.paypal.com";
         }
         return $baseUrl;
     }
@@ -325,9 +325,10 @@ public function CreatePayment(CreditCartSession $cart, $returnUrl, $cancelUrl)
             $headers = ['Accept' => 'application/json', 'Accept-Language' => 'en_US', 'Content-Type' => 'application/json', "Authorization" => "Bearer $token"];
             $purchaseRequest = ['description' => $resources->GetString('CreditPurchase'), 'amount' => ['value' => "{$cart->Total()}", 'currency_code' => $cart->Currency]];
             $data = [
-                    'intent' => 'CAPTURE',
-                    'application_context' => ['return_url' => $returnUrl, 'cancel_url' => $cancelUrl],
-                    'purchase_units' => [$purchaseRequest]];
+                'intent' => 'CAPTURE',
+                'application_context' => ['return_url' => $returnUrl, 'cancel_url' => $cancelUrl],
+                'purchase_units' => [$purchaseRequest]
+            ];
             $body = Unirest\Request\Body::json($data);
             Unirest\Request::verifyPeer(false);
             $response = Unirest\Request::post($checkoutUrl, $headers, $body);
@@ -530,8 +531,8 @@ public function IsEnabled()
     public function Settings()
     {
         return [
-                new PaymentGatewaySetting(self::PUBLISHABLE_KEY, $this->PublishableKey()),
-                new PaymentGatewaySetting(self::SECRET_KEY, $this->SecretKey()),
+            new PaymentGatewaySetting(self::PUBLISHABLE_KEY, $this->PublishableKey()),
+            new PaymentGatewaySetting(self::SECRET_KEY, $this->SecretKey()),
         ];
     }
 
@@ -564,19 +565,19 @@ public function Charge(CreditCartSession $cart, $email, $token, IPaymentTransact
             \Stripe\Stripe::setApiKey($this->SecretKey());
 
             $customer = \Stripe\Customer::create([
-                                                         'email' => $email,
-                                                         'source' => $token
-                                                 ]);
+                'email' => $email,
+                'source' => $token
+            ]);
 
             $currency = new \Booked\Currency($cart->Currency);
 
             $charge = \Stripe\Charge::create([
-                                                     'customer' => $customer->id,
-                                                     'amount' => $currency->ToStripe($cart->Total()),
-                                                     'currency' => strtolower($cart->Currency),
-                                                     'description' => Resources::GetInstance()->GetString('Credits'),
-                                                     'expand' => ['balance_transaction']
-                                             ]);
+                'customer' => $customer->id,
+                'amount' => $currency->ToStripe($cart->Total()),
+                'currency' => strtolower($cart->Currency),
+                'description' => Resources::GetInstance()->GetString('Credits'),
+                'expand' => ['balance_transaction']
+            ]);
 
             if (Log::DebugEnabled()) {
                 Log::Debug('Stripe charge response %s', json_encode($charge));
@@ -598,7 +599,7 @@ public function Charge(CreditCartSession $cart, $email, $token, IPaymentTransact
                 json_encode($charge)
             );
             return $charge->status == 'succeeded';
-        } catch (\Stripe\Error\Card $ex) {
+        } catch (\Stripe\Exception\CardException $ex) {
             // Declined
             $body = $ex->getJsonBody();
             $err = $body['error'];
@@ -610,15 +611,15 @@ public function Charge(CreditCartSession $cart, $email, $token, IPaymentTransact
                 $err['param'],
                 $err['message']
             );
-        } catch (\Stripe\Error\RateLimit $ex) {
+        } catch (\Stripe\Exception\RateLimitException $ex) {
             Log::Error('Stripe - too many requests. %s', $ex);
-        } catch (\Stripe\Error\InvalidRequest $ex) {
+        } catch (\Stripe\Exception\InvalidRequestException $ex) {
             Log::Error('Stripe - invalid request. %s', $ex);
-        } catch (\Stripe\Error\Authentication $ex) {
+        } catch (\Stripe\Exception\AuthenticationException $ex) {
             Log::Error('Stripe - authentication error. %s', $ex);
-        } catch (\Stripe\Error\ApiConnection $ex) {
+        } catch (\Stripe\Exception\ApiConnectionException $ex) {
             Log::Error('Stripe - connection failure. %s', $ex);
-        } catch (\Stripe\Error\Base $ex) {
+        } catch (\Stripe\Exception\ApiErrorException $ex) {
             Log::Error('Stripe - error. %s', $ex);
         } catch (Exception $ex) {
             Log::Error('Stripe - internal error. %s', $ex);
@@ -640,10 +641,10 @@ public function Refund(TransactionLogView $log, $amount, IPaymentTransactionLogg
 
             \Stripe\Stripe::setApiKey($this->SecretKey());
             $refund = \Stripe\Refund::create([
-                                                     'charge' => $log->TransactionId,
-                                                     'amount' => $currency->ToStripe($amount),
-                                                     'expand' => ['balance_transaction']
-                                             ]);
+                'charge' => $log->TransactionId,
+                'amount' => $currency->ToStripe($amount),
+                'expand' => ['balance_transaction']
+            ]);
 
             if (Log::DebugEnabled()) {
                 Log::Debug('Stripe refund response %s', json_encode($refund));
@@ -663,7 +664,7 @@ public function Refund(TransactionLogView $log, $amount, IPaymentTransactionLogg
             );
 
             return $refund->status == 'succeeded';
-        } catch (\Stripe\Error\Card $ex) {
+        } catch (\Stripe\Exception\CardException $ex) {
             // Declined
             $body = $ex->getJsonBody();
             $err = $body['error'];
@@ -675,15 +676,15 @@ public function Refund(TransactionLogView $log, $amount, IPaymentTransactionLogg
                 $err['param'],
                 $err['message']
             );
-        } catch (\Stripe\Error\RateLimit $ex) {
+        } catch (\Stripe\Exception\RateLimitException $ex) {
             Log::Error('Stripe refund - too many requests. %s', $ex);
-        } catch (\Stripe\Error\InvalidRequest $ex) {
+        } catch (\Stripe\Exception\InvalidRequestException $ex) {
             Log::Error('Stripe refund - invalid request. %s', $ex);
-        } catch (\Stripe\Error\Authentication $ex) {
+        } catch (\Stripe\Exception\AuthenticationException $ex) {
             Log::Error('Stripe refund - authentication error. %s', $ex);
-        } catch (\Stripe\Error\ApiConnection $ex) {
+        } catch (\Stripe\Exception\ApiConnectionException $ex) {
             Log::Error('Stripe refund - connection failure. %s', $ex);
-        } catch (\Stripe\Error\Base $ex) {
+        } catch (\Stripe\Exception\ApiErrorException $ex) {
             Log::Error('Stripe - error. %s', $ex);
         } catch (Exception $ex) {
             Log::Error('Stripe refund - internal error. %s', $ex);

Pages/Export/AtomSubscriptionPage.php

@@ -5,8 +5,8 @@
 require_once(ROOT_DIR . 'lib/Application/Reservation/namespace.php');
 require_once(ROOT_DIR . 'Domain/Access/namespace.php');
 require_once(ROOT_DIR . 'Pages/Export/CalendarSubscriptionPage.php');
-require_once(ROOT_DIR . 'lib/external/FeedWriter/FeedWriter.php');
-require_once(ROOT_DIR . 'lib/external/FeedWriter/FeedItem.php');
+
+use \FeedWriter\ATOM;
 
 class AtomSubscriptionPage extends Page implements ICalendarSubscriptionPage
 {
@@ -52,17 +52,16 @@ public function PageLoad()
 
         $config = Configuration::Instance();
 
-        $feed = new FeedWriter(ATOM);
+        $feed = new ATOM();
         $title = $config->GetKey(ConfigKeys::APP_TITLE);
         $feed->setTitle(Resources::GetInstance()->GetString('AtomFeedTitle', [$title]));
         $url = $config->GetScriptUrl();
         $feed->setLink($url);
 
         $lastUpdated = Date::Min();
-        $feed->setChannelElement('author', ['name'=>$title]);
+        $feed->setChannelElement('author', ['name' => $title]);
 
         foreach ($this->reservations as $reservation) {
-            /** @var FeedItem $item */
             $item = $feed->createNewItem();
             $item->setTitle($reservation->Summary);
             $item->setLink($reservation->ReservationUrl);
@@ -80,7 +79,7 @@ public function PageLoad()
         }
 
         $feed->setChannelElement('updated', $lastUpdated->Format(DATE_ATOM));
-        $feed->genarateFeed();
+        $feed->printFeed();
     }
 
     public function SetReservations($reservations)

Pages/Page.php

@@ -10,7 +10,8 @@
 require_once(ROOT_DIR . 'lib/Common/namespace.php');
 require_once(ROOT_DIR . 'lib/Server/namespace.php');
 require_once(ROOT_DIR . 'lib/Config/namespace.php');
-require_once(ROOT_DIR . 'lib/external/MobileDetect/Mobile_Detect.php');
+
+use Detection\MobileDetect;
 
 abstract class Page implements IPage
 {
@@ -131,7 +132,7 @@ protected function __construct($titleKey = '', $pageDepth = 0)
         }
         $this->smarty->assign('HomeUrl', $logoUrl);
 
-        $detect = new Mobile_Detect();
+        $detect = new MobileDetect();
         $this->IsMobile = $detect->isMobile();
         $this->IsTablet = $detect->isTablet();
         $this->IsDesktop = !$this->IsMobile && !$this->IsTablet;
@@ -403,7 +404,7 @@ protected function DisplayCsv($templateName, $fileName)
      */
     protected function DisplayLocalized($templateName)
     {
-        $languageCode = $this->GetVar('CurrentLanguage');        
+        $languageCode = $this->GetVar('CurrentLanguage');
         $localizedPath = ROOT_DIR . 'lang/' . $languageCode;
         $defaultPath = ROOT_DIR . 'lang/en_us/';
 

Presenters/Admin/Import/ICalImportPresenter.php

@@ -1,9 +1,10 @@
 <?php
 
 require_once(ROOT_DIR . 'Domain/namespace.php');
-require_once(ROOT_DIR . 'lib/external/icalreader/icalreader.php');
 require_once(ROOT_DIR . 'Pages/Admin/Import/ICalImportPage.php');
 
+use Sabre\VObject\Reader;
+
 class ICalImportPresenter extends ActionPresenter
 {
     /**
@@ -80,57 +81,43 @@ public function Import()
             die($error);
         }
 
-        $icalReader = new ICal();
-
         $contents = $file->Contents();
 
         if (empty($contents)) {
             die('Invalid import file');
         }
 
-        /** @var ICal $ical */
-        $ical = $icalReader->initLines(explode("\n", trim($file->Contents())));
-
-        if ($ical === false) {
-            die('Invalid import file');
+        try {
+            $vcalendar = Reader::read($contents);
+        } catch (\Exception $e) {
+            die('Invalid import file: ' . $e->getMessage());
         }
 
-        $events = $icalReader->events();
-
+        $events = $vcalendar->VEVENT;
         Log::Debug('Found %s events in ics file', count($events));
 
         foreach ($events as $event) {
             try {
-                if (!array_key_exists('LOCATION', $event)) {
-                    $numberSkipped++;
-                    Log::Debug('Skipping ics import - missing resource');
-                    continue;
-                }
-                $location = $event['LOCATION'];
-
-                if (empty($location)) {
+                if (empty($event->LOCATION)) {
                     $numberSkipped++;
                     Log::Debug('Skipping ics import - missing resource');
                     continue;
                 }
 
-                $organizer = '';
-                if (array_key_exists('ORGANIZER', $event)) {
-                    $organizer = $event['ORGANIZER'];
-                }
+                $location = (string)$event->LOCATION;
+                $organizer = isset($event->ORGANIZER) ? (string)$event->ORGANIZER : '';
 
                 $user = $this->GetOrCreateUser($organizer);
                 $resource = $this->GetOrCreateResource($location);
 
-                $startts = date('Y-m-d H:i:s', $icalReader->iCalDateToUnixTimestamp($event['DTSTART']));
-                $start = Date::Parse($startts, $this->GetTimezone($event, 'DTSTART_array'));
+                $start = $event->DTSTART->getDateTime(); // \DateTime object
+                $end = $event->DTEND->getDateTime();     // \DateTime object
 
-                $endts = date('Y-m-d H:i:s', $icalReader->iCalDateToUnixTimestamp($event['DTEND']));
-                $end = Date::Parse($endts, $this->GetTimezone($event, 'DTEND_array'));
+                $start = Date::Parse($start->format('Y-m-d H:i:s'));
+                $end = Date::Parse($end->format('Y-m-d H:i:s'));
 
-                $title = array_key_exists('SUMMARY', $event) ? htmlspecialchars($event['SUMMARY']) : '';
-                $description = array_key_exists('DESCRIPTION', $event) ? htmlspecialchars($event['DESCRIPTION']) : '';
-                ;
+                $title = isset($event->SUMMARY) ? htmlspecialchars((string)$event->SUMMARY) : '';
+                $description = isset($event->DESCRIPTION) ? htmlspecialchars((string)$event->DESCRIPTION) : '';
 
                 $reservation = ReservationSeries::Create(
                     $user->Id(),
@@ -141,14 +128,14 @@ public function Import()
                     new RepeatNone(),
                     ServiceLocator::GetServer()->GetUserSession()
                 );
+
                 $participantIds = [];
 
-                if (array_key_exists('ATTENDEE_array', $event)) {
-                    foreach ($event['ATTENDEE_array'] as $attendee) {
-                        if (is_string($attendee)) {
-                            $participant = $this->GetOrCreateUser($attendee);
-                            $participantIds[] = $participant->Id();
-                        }
+                if (isset($event->ATTENDEE)) {
+                    foreach ($event->select('ATTENDEE') as $attendee) {
+                        $email = (string)$attendee;
+                        $participant = $this->GetOrCreateUser($email);
+                        $participantIds[] = $participant->Id();
                     }
                 }
 
@@ -157,7 +144,6 @@ public function Import()
                 }
 
                 Log::Debug('Importing reservation on %s - %s for %s', $start, $end, $location);
-
                 $this->reservationRepository->Add($reservation);
                 $numberImported++;
             } catch (Exception $ex) {
@@ -166,7 +152,6 @@ public function Import()
         }
 
         Log::Debug('Done running ics import. Imported %s Skipped %s', $numberImported, $numberSkipped);
-
         $this->page->SetNumberImported($numberImported, $numberSkipped);
     }