standardebooks/web
1
0
Fork 0
mirror of https://github.com/standardebooks/web.git synced 2025-07-12 09:32:24 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Some type check fixes

Browse source
This commit is contained in:
Alex Cabal 2023-06-21 11:01:43 -05:00
parent d4707eb595
commit bd4b8d8944
6 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/Ebook.php
View file

@ -6,6 +6,7 @@ use function Safe\json_encode;
use function Safe\glob; use function Safe\glob;
use function Safe\preg_match; use function Safe\preg_match;
use function Safe\preg_replace; use function Safe\preg_replace;
use function Safe\sprintf;
use function Safe\substr; use function Safe\substr;
class Ebook{ class Ebook{
@ -108,7 +109,7 @@ class Ebook{
// emits a warning. So, just silence the warning. // emits a warning. So, just silence the warning.
$bytes = @filesize($this->WwwFilesystemPath . '/text/single-page.xhtml'); $bytes = @filesize($this->WwwFilesystemPath . '/text/single-page.xhtml');
$sizes = 'BKMGTP'; $sizes = 'BKMGTP';
$factor = floor((strlen($bytes) - 1) / 3); $factor = intval(floor((strlen((string)$bytes) - 1) / 3));
$this->TextSinglePageSizeNumber = sprintf('%.1f', $bytes / pow(1024, $factor)); $this->TextSinglePageSizeNumber = sprintf('%.1f', $bytes / pow(1024, $factor));
$this->TextSinglePageSizeUnit = $sizes[$factor] ?? ''; $this->TextSinglePageSizeUnit = $sizes[$factor] ?? '';
$this->TextSinglePageUrl = $this->Url . '/text/single-page'; $this->TextSinglePageUrl = $this->Url . '/text/single-page';

2
lib/NewsletterSubscription.php
View file

@ -57,7 +57,7 @@ class NewsletterSubscription extends PropertiesBase{
', [$this->User->UserId, false, $this->IsSubscribedToNewsletter, $this->IsSubscribedToSummary, $this->Created]); ', [$this->User->UserId, false, $this->IsSubscribedToNewsletter, $this->IsSubscribedToSummary, $this->Created]);
} }
catch(PDOException $ex){ catch(PDOException $ex){
if($ex->errorInfo[1] == 1062){ if(($ex->errorInfo[1] ?? 0) == 1062){
// Duplicate unique key; email already in use // Duplicate unique key; email already in use
throw new Exceptions\NewsletterSubscriptionExistsException(); throw new Exceptions\NewsletterSubscriptionExistsException();
} }

2
lib/Payment.php
View file

@ -63,7 +63,7 @@ class Payment extends PropertiesBase{
', [$this->UserId, $this->Created, $this->ChannelId, $this->TransactionId, $this->Amount, $this->Fee, $this->IsRecurring, $this->IsMatchingDonation]); ', [$this->UserId, $this->Created, $this->ChannelId, $this->TransactionId, $this->Amount, $this->Fee, $this->IsRecurring, $this->IsMatchingDonation]);
} }
catch(PDOException $ex){ catch(PDOException $ex){
if($ex->errorInfo[1] == 1062){ if(($ex->errorInfo[1] ?? 0) == 1062){
// Duplicate unique key; transction ID already exists // Duplicate unique key; transction ID already exists
throw new Exceptions\PaymentExistsException(); throw new Exceptions\PaymentExistsException();
} }

1
lib/Session.php
View file

@ -1,6 +1,7 @@
<? <?
use Ramsey\Uuid\Uuid; use Ramsey\Uuid\Uuid;
use Safe\DateTime; use Safe\DateTime;
use function Safe\strtotime;
/** /**
* @property User $User * @property User $User

2
lib/User.php
View file

@ -88,7 +88,7 @@ class User extends PropertiesBase{
', [$this->Email, $this->Name, $this->Uuid, $this->Created]); ', [$this->Email, $this->Name, $this->Uuid, $this->Created]);
} }
catch(PDOException $ex){ catch(PDOException $ex){
if($ex->errorInfo[1] == 1062){ if(($ex->errorInfo[1] ?? 0) == 1062){
// Duplicate unique key; email already in use // Duplicate unique key; email already in use
throw new Exceptions\UserExistsException(); throw new Exceptions\UserExistsException();
} }

1
www/webhooks/postmark.php
View file

@ -65,7 +65,6 @@ try{
curl_setopt($handle, CURLOPT_CUSTOMREQUEST, "POST"); curl_setopt($handle, CURLOPT_CUSTOMREQUEST, "POST");
curl_setopt($handle, CURLOPT_POSTFIELDS, '{"Suppressions": [{"EmailAddress": "' . $email . '"}]}'); curl_setopt($handle, CURLOPT_POSTFIELDS, '{"Suppressions": [{"EmailAddress": "' . $email . '"}]}');
curl_exec($handle); curl_exec($handle);
curl_close($handle);
} }
elseif($post->RecordType == 'SubscriptionChange' && $post->SuppressionReason === null){ elseif($post->RecordType == 'SubscriptionChange' && $post->SuppressionReason === null){
$log->Write('Event type: suppression deletion.'); $log->Write('Event type: suppression deletion.');