From eb063d3f69410c815409cd3feb165c6bb86f0658 Mon Sep 17 00:00:00 2001 From: pero1203 Date: Tue, 22 Feb 2022 10:27:32 +0100 Subject: [PATCH] Redesign - popravek analiz previewja --- .../survey/classes/class.LibraryBranching.php | 1243 +++++++++++++++++ composer.lock | 192 +-- public/css/admin_new.css | 6 +- .../components/header/navigation.scss | 2 +- .../pages/survey_analysis/preview.scss | 4 +- vendor/composer/autoload_classmap.php | 3 + vendor/composer/autoload_static.php | 3 + vendor/composer/installed.json | 104 +- vendor/composer/installed.php | 36 +- .../phpasn1/.github/workflows/phpunit.yml | 35 + vendor/fgrosse/phpasn1/CHANGELOG.md | 14 +- vendor/fgrosse/phpasn1/README.md | 2 +- vendor/fgrosse/phpasn1/composer.json | 6 +- vendor/fgrosse/phpasn1/lib/ASN1/Construct.php | 13 +- vendor/phpmailer/phpmailer/VERSION | 2 +- vendor/phpmailer/phpmailer/composer.json | 9 +- .../phpmailer/language/phpmailer.lang-fr.php | 2 +- vendor/phpmailer/phpmailer/src/PHPMailer.php | 26 +- vendor/phpmailer/phpmailer/src/POP3.php | 2 +- vendor/phpmailer/phpmailer/src/SMTP.php | 3 +- vendor/stripe/stripe-php/CHANGELOG.md | 52 +- vendor/stripe/stripe-php/README.md | 6 +- vendor/stripe/stripe-php/VERSION | 2 +- vendor/stripe/stripe-php/composer.json | 2 +- vendor/stripe/stripe-php/init.php | 4 +- vendor/stripe/stripe-php/lib/Account.php | 10 +- .../stripe/stripe-php/lib/ApplicationFee.php | 4 +- .../lib/BillingPortal/Configuration.php | 1 + .../stripe/stripe-php/lib/BitcoinReceiver.php | 2 +- vendor/stripe/stripe-php/lib/Charge.php | 2 +- .../stripe-php/lib/Checkout/Session.php | 11 +- vendor/stripe/stripe-php/lib/Collection.php | 40 +- vendor/stripe/stripe-php/lib/Coupon.php | 4 +- vendor/stripe/stripe-php/lib/CreditNote.php | 4 +- vendor/stripe/stripe-php/lib/Customer.php | 20 +- vendor/stripe/stripe-php/lib/File.php | 2 +- .../lib/Identity/VerificationSession.php | 4 +- vendor/stripe/stripe-php/lib/Invoice.php | 5 +- .../stripe-php/lib/Issuing/Authorization.php | 4 +- vendor/stripe/stripe-php/lib/Issuing/Card.php | 1 + .../stripe/stripe-php/lib/Issuing/Dispute.php | 2 +- vendor/stripe/stripe-php/lib/Order.php | 2 +- .../stripe/stripe-php/lib/PaymentIntent.php | 20 +- vendor/stripe/stripe-php/lib/PaymentLink.php | 70 + vendor/stripe/stripe-php/lib/Plan.php | 2 +- vendor/stripe/stripe-php/lib/Price.php | 4 +- vendor/stripe/stripe-php/lib/Product.php | 12 +- .../stripe/stripe-php/lib/PromotionCode.php | 2 +- vendor/stripe/stripe-php/lib/Quote.php | 6 +- .../stripe/stripe-php/lib/Radar/ValueList.php | 2 +- vendor/stripe/stripe-php/lib/Recipient.php | 2 +- vendor/stripe/stripe-php/lib/Refund.php | 1 + .../stripe-php/lib/Service/AccountService.php | 15 +- .../lib/Service/ApplePayDomainService.php | 2 +- .../lib/Service/ApplicationFeeService.php | 4 +- .../lib/Service/BalanceTransactionService.php | 2 +- .../BillingPortal/ConfigurationService.php | 2 +- .../stripe-php/lib/Service/ChargeService.php | 2 +- .../lib/Service/Checkout/SessionService.php | 4 +- .../lib/Service/CoreServiceFactory.php | 2 + .../lib/Service/CountrySpecService.php | 2 +- .../stripe-php/lib/Service/CouponService.php | 2 +- .../lib/Service/CreditNoteService.php | 6 +- .../lib/Service/CustomerService.php | 13 +- .../stripe-php/lib/Service/DisputeService.php | 2 +- .../stripe-php/lib/Service/EventService.php | 2 +- .../lib/Service/ExchangeRateService.php | 2 +- .../lib/Service/FileLinkService.php | 2 +- .../stripe-php/lib/Service/FileService.php | 2 +- .../Identity/VerificationReportService.php | 2 +- .../Identity/VerificationSessionService.php | 2 +- .../lib/Service/InvoiceItemService.php | 2 +- .../stripe-php/lib/Service/InvoiceService.php | 6 +- .../Service/Issuing/AuthorizationService.php | 2 +- .../lib/Service/Issuing/CardService.php | 2 +- .../lib/Service/Issuing/CardholderService.php | 2 +- .../lib/Service/Issuing/DisputeService.php | 2 +- .../Service/Issuing/TransactionService.php | 2 +- .../lib/Service/OrderReturnService.php | 2 +- .../stripe-php/lib/Service/OrderService.php | 2 +- .../lib/Service/PaymentIntentService.php | 18 +- .../lib/Service/PaymentLinkService.php | 89 ++ .../lib/Service/PaymentMethodService.php | 2 +- .../stripe-php/lib/Service/PayoutService.php | 2 +- .../stripe-php/lib/Service/PlanService.php | 2 +- .../stripe-php/lib/Service/PriceService.php | 2 +- .../stripe-php/lib/Service/ProductService.php | 2 +- .../lib/Service/PromotionCodeService.php | 7 +- .../stripe-php/lib/Service/QuoteService.php | 6 +- .../Radar/EarlyFraudWarningService.php | 2 +- .../Service/Radar/ValueListItemService.php | 2 +- .../lib/Service/Radar/ValueListService.php | 2 +- .../stripe-php/lib/Service/RefundService.php | 2 +- .../Service/Reporting/ReportRunService.php | 2 +- .../Service/Reporting/ReportTypeService.php | 2 +- .../stripe-php/lib/Service/ReviewService.php | 2 +- .../lib/Service/SetupAttemptService.php | 2 +- .../lib/Service/SetupIntentService.php | 18 +- .../lib/Service/ShippingRateService.php | 2 +- .../Sigma/ScheduledQueryRunService.php | 2 +- .../stripe-php/lib/Service/SkuService.php | 2 +- .../lib/Service/SubscriptionItemService.php | 4 +- .../Service/SubscriptionScheduleService.php | 2 +- .../lib/Service/SubscriptionService.php | 2 +- .../stripe-php/lib/Service/TaxCodeService.php | 2 +- .../stripe-php/lib/Service/TaxRateService.php | 2 +- .../lib/Service/Terminal/LocationService.php | 6 +- .../lib/Service/Terminal/ReaderService.php | 2 +- .../stripe-php/lib/Service/TopupService.php | 2 +- .../lib/Service/TransferService.php | 4 +- .../lib/Service/WebhookEndpointService.php | 2 +- vendor/stripe/stripe-php/lib/SetupIntent.php | 17 + vendor/stripe/stripe-php/lib/Stripe.php | 2 +- vendor/stripe/stripe-php/lib/StripeClient.php | 1 + vendor/stripe/stripe-php/lib/Subscription.php | 2 +- .../stripe-php/lib/SubscriptionItem.php | 6 +- vendor/stripe/stripe-php/lib/TaxId.php | 5 +- vendor/stripe/stripe-php/lib/Transfer.php | 4 +- .../stripe-php/lib/Util/ObjectTypes.php | 1 + .../symfony/polyfill-intl-idn/bootstrap80.php | 4 +- 120 files changed, 1997 insertions(+), 347 deletions(-) create mode 100644 admin/survey/classes/class.LibraryBranching.php create mode 100644 vendor/fgrosse/phpasn1/.github/workflows/phpunit.yml create mode 100644 vendor/stripe/stripe-php/lib/PaymentLink.php create mode 100644 vendor/stripe/stripe-php/lib/Service/PaymentLinkService.php diff --git a/admin/survey/classes/class.LibraryBranching.php b/admin/survey/classes/class.LibraryBranching.php new file mode 100644 index 000000000..53a296a1f --- /dev/null +++ b/admin/survey/classes/class.LibraryBranching.php @@ -0,0 +1,1243 @@ + library pri datotekah, 0 -> glasovanje, 1 -> forma, 2 -> ankata na več straneh, 3 -> ifi + var $skin = 0; + + private $isSearch = 0; // ali izvajamo search po anektah + private $searchString = ''; // geslo po katerem iscemo po anketah + private $searchStringProcessed = array(); // geslo po katerem iscemo po anketah, obdelano (skrajsano da isce tudi po drugih sklanjatvah) + private $searchSettings = array(); // nastavitve searcha + + + /** + * @desc konstruktor + */ + function __construct ($_options = array()) { + global $surveySkin; + + if (isset($surveySkin)) + $this->skin = $surveySkin; + + $this->SurveyAdmin = new SurveyAdmin(1, -1); + $this->Branching = new Branching($this->SurveyAdmin->anketa); + + if (isset($_options['tab'])) { + $this->tab = $_options['tab']; + if ($this->tab <= 1) + $this->tip = 0; + else + $this->tip = 1; + } + else if (isset($_POST['tab'])) { + $this->tab = ($_POST['tab'] == 0 || $_POST['tab'] == 'undefined') ? 0 : $_POST['tab']; + if ($this->tab <= 1) + $this->tip = 0; + else + $this->tip = 1; + } + else { + $this->tab = 0; + $this->tip = 0; + } + + if (isset($_options['prva'])) { + $this->prva = $_options['prva']; + } + else { + $this->prva = 0; + } + + if (isset($_GET['tab'])) $this->tab = (int)$_GET['tab']; + + // nastavimo mode v odvisnosti od survey_type ( če nismo v anketi je -1) + if (isset($this->SurveyAdmin->anketa) && $this->SurveyAdmin->anketa > 0) { + $_st = $this->SurveyAdmin->getSurvey_type($this->SurveyAdmin->anketa); + + if ($_st > -1) + $this->mode = $_st; + } + + $this->repareTabs(); + + // Preverimo ce gre za search po anketah + if(isset($_GET['search']) && $_GET['search'] != ''){ + $this->isSearch = 1; + $this->searchString = str_replace("\\", "", trim($_GET['search'])); + + // Iscemo po naslovu ali vsebini + $this->searchSettings['stype'] = (isset($_GET['stype'])) ? $_GET['stype'] : '0'; + } + } + + + /** + * @desc prikaze knjiznico znotraj ankete na desni + */ + function display () { + global $admin_type; + global $global_user_id; + global $lang; + + echo '
'; + echo ' '.$lang['srv_library']; + echo ''; + echo '
'; + + $this->display_tabs(); + + echo '
'; + + echo '
'; + $this->display_folders(); + echo '
'; + + echo '
'; + } + + /** + * @desc prikaze tabe za izbiro + */ + function display_tabs () { + global $lang; + + echo '

'; + echo 'tab==0 || $this->tab==1 ? ' class="highlightTabBlackLeft"' : ' class="nohighlight"') . ' >'; + echo '' . $lang['srv_vprasanja'] . ''; + echo 'tab==2 || $this->tab==3 ? ' class="highlightTabBlackRight"' : ' class="nohighlight"') . ' >'; + echo '' . $lang['srv_ankete'] . ''; + echo '

'; + } + + function display_folders () { + global $global_user_id; + global $lang; + + // Knjiznica znotraj posamezne ankete + if ($this->prva == 0) { + $this->display_contentfolders(0, 0); + $this->display_contentfolders(0, $global_user_id); + + if ($this->tip == 1) { + echo '

'.$lang['srv_library_edit'].'
'; + + $sql = sisplet_query("SELECT * FROM srv_library_anketa WHERE uid='".$global_user_id."' AND ank_id='".$this->SurveyAdmin->anketa."'"); + if (mysqli_num_rows($sql) == 0) { + echo '

+ '.$lang['srv_library_edit_add'].' +

'; + } + + } else { + echo '

'.$lang['srv_library_q_txt'].'

'; + } + + //echo ''.$lang['srv_zapri'].''; + } + // Knjiznica na prvi strani zraven mojih anket + else { + // Na prvi strani imamo search + if($this->isSearch == 1){ + echo '
'; + $this->displaySearchSettings(); + echo '
'; + + echo '
'; + + $this->display_contentfolders_searchList(); + } + else{ + echo '
'; + $this->displaySearch(); + echo '
'; + + echo '
'; + + $this->display_contentfolders(); + } + } + } + + /** + * @desc prikaze folderje v knjiznici + */ + function display_contentfolders ($parent = 0, $uid = -1) { + global $lang; + global $admin_type; + global $global_user_id; + global $site_url; + + $language = ""; + + if ($uid == -1) { + if ($this->tab == 0 || $this->tab == 2) { + $uid = 0; + } else { + $uid = $global_user_id; + } + } + + if ($parent == 0 && $uid == 0) { + $language = " AND lang='$lang[id]' "; + } + + $cookie = $_COOKIE['library_folders']; + // da se v url lahko doda odprte folderje: &libfolder=131-147 (more vkljucevat tudi parente) + if (isset($_GET['libfolder'])) $cookie .= '-'.$_GET['libfolder'].'-'; + + if ($parent == 0) { + // v skrite html elemente shranimo tab, in prva + echo 'tab").'">'; + echo 'tip").'">'; + echo 'prva").'">'; + + echo ''."\n"; + } + + if ( $parent == 0 ) { + ?> + + '; + echo '
'; + + echo '
'; + if ($admin_type==0 or $this->tab==1) + echo ' '; + echo '
'; + + echo '
'; + + echo ' '; + + echo skrajsaj(strip_tags(($row['label']!=''?$row['label']:($row['tip']==0?$lang['srv_pogoj']:$lang['srv_blok']))), 40).''."\n"; + + echo '
'; + + echo '
'; + } + + } + + + /** + * @desc prikaze seznam iskanih anket v knjiznici + */ + function display_contentfolders_searchList () { + global $lang; + global $admin_type; + global $global_user_id; + global $site_url; + + $language = ""; + + if ($this->tab == 2) + $uid = 0; + else + $uid = $global_user_id; + + if ($uid == 0) + $language = " AND lang='$lang[id]' "; + + // v skrite html elemente shranimo tab, in prva + echo ''; + echo ''; + echo ''; + + echo ''."\n"; + echo ' '."\n"; + + + if ($parent == 0) { + echo ''."\n"; + } + + if ( $parent == 0 ) { + ?> + + '.$lang['s_search_settings_lib'].''; + + echo '
'; + + // Hidden polja za knjiznico + echo ''; + if($this->tab == '3') + echo ''; + + // Iskano geslo + echo '

'; + echo ' '.$lang['s_search2'].': '; + echo '

'; + + // Iskanje po naslovu ali avtorju ali besedilu + echo '

'; + echo ' '.$lang['s_thru'].': '; + echo ' '; + echo ' '; + echo '

'; + + // Gumba isci in zapri + echo ''; + echo '
'; + echo ' '.$lang['srv_zapri'].''; + echo '
'; + echo '
'; + echo ' '.$lang['s_search'].''; + echo '
'; + echo ''; + + // Link na isci po mojih anketah + echo ''.$lang['s_search_mySurvey'].''; + + echo ''; + + echo '
'; + } + + // Prikazemo search okno za iskanje po anketah znotraj knjiznice + private function displaySearch(){ + global $lang; + global $site_url; + + echo '
'; + + // Hidden polja za knjiznico + echo ''; + if($this->tab == '3') + echo ''; + + //echo ' '; + echo ''; + + //echo ''; + echo '
'; + echo ' '.$lang['s_search2'].''; + echo '
'; + + echo '
'; + } + + // vrne sql string za search po anketah glede na nastavitve searcha + private function getSearchString(){ + + $search_text = mysqli_real_escape_string($GLOBALS['connect_db'], $this->searchString); + + // Vse gre v lowerstring + $search_text = strtolower($search_text); + + // Sklanjamo po search besedi + $search_text = explode (" ", $search_text); + + for ($a=0; $a 5) + $search_text[$a] = substr ($search_text[$a], 0, -2); + elseif (strlen ($search_text[$a]) > 2) + $search_text[$a] = substr ($search_text[$a], 0, -1); + else + $search_text[$a] = $search_text[$a]; + + $this->searchStringProcessed[$a] = $search_text[$a]; + $search_text[$a] = '%'.$search_text[$a].'%'; + } + + $search_text = implode (" ", $search_text); + + // Search po kljucnih besedah znotraj vprasanj (naslovi vprasanj in vrednosti) + if($this->searchSettings['stype'] == '1') + $result = " AND (LOWER(sa.introduction) LIKE LOWER('".$search_text."') + OR LOWER(sa.conclusion) LIKE LOWER('".$search_text."') + OR LOWER(ss.naslov) LIKE LOWER('".$search_text."') + OR LOWER(sv.naslov) LIKE LOWER('".$search_text."'))"; + // Search po naslovu + else + $result = " AND (LOWER(sa.naslov) LIKE LOWER('".$search_text."') OR LOWER(sa.akronim) LIKE LOWER('".$search_text."'))"; + + return $result; + } + + + /** + * @desc pohendla ajax klice + */ + function ajax () { + + if (isset($_POST['tab'])) + $this->tab = (int)$_POST['tab']; + else if (isset($_GET['tab'])) + $this->tab = (int)$_GET['tab']; + if ($this->tab == 'undefined') + $this->tab = 0; + if (isset($_POST['prva'])) + $this->prva = $_POST['prva']; + else if (isset($_GET['prva'])) + $this->prva = $_GET['prva']; + if ($this->prva == 'undefined') + $this->prva = 0; + + if ($this->tab <= 1) + $this->tip = 0; + else + $this->tip = 1; + + if ($_GET['a'] == 'display_knjiznica') { + $this->ajax_display_knjiznica(); + + } elseif ($_GET['a'] == 'library_add') { + $this->ajax_library_add(); + + } elseif ($_GET['a'] == 'spr_dropped') { + $this->ajax_spr_dropped(); + + } elseif ($_GET['a'] == 'if_dropped') { + $this->ajax_if_dropped(); + + } elseif ($_GET['a'] == 'folder_dropped') { + $this->ajax_folder_dropped(); + + } elseif ($_GET['a'] == 'folder_rename') { + $this->ajax_folder_rename(); + + } elseif ($_GET['a'] == 'folder_newname') { + $this->ajax_folder_newname(); + + } elseif ($_GET['a'] == 'new_folder') { + $this->ajax_new_folder(); + + } elseif ($_GET['a'] == 'delete_folder') { + $this->ajax_delete_folder(); + + } elseif ($_GET['a'] == 'folder_collapsed') { + $this->ajax_folder_collapsed(); + + } elseif ($_GET['a'] == 'library_del_anketa') { + $this->ajax_library_del_anketa(); + + } elseif ($_GET['a'] == 'library_del_myanketa') { + $this->ajax_library_del_myanketa(); + + } elseif ($_GET['a'] == 'library_add_myanketa') { + $this->ajax_library_add_myanketa(); + + } elseif ($_GET['a'] == 'anketa_copy') { + $this->ajax_anketa_copy(); + } elseif ($_GET['a'] == 'anketa_copy_new') { + $this->ajax_anketa_copy_new(); + + } elseif ($_GET['a'] == 'if_remove') { + $this->ajax_if_remove(); + + } elseif ($_GET['a'] == 'brisi_spremenljivko') { + $this->ajax_brisi_spremenljivko(); + + } elseif ($_GET['a'] == 'alert_copy_anketa') { + $this->ajax_alert_copy_anketa(); + + } elseif ($_GET['a'] == 'anketa_archive_and_copy') { + $this->ajax_anketa_archive_and_copy(); + + } + } + + function ajax_display_knjiznica () { + $this->display(); + } + + function ajax_library_add () { + global $lang; + + $data = array(); + + if ($this->tip == 0) { + $spremenljivka = substr($_POST['spremenljivka'], 10); // odrezemo branching_ + $folder = $_POST['folder']; + + // v knjiznico dodamo spremenljivko + if ($spremenljivka > 0) { + $id = $this->Branching->nova_spremenljivka(-1, 0, 0, $spremenljivka); + sisplet_query("UPDATE srv_spremenljivka SET folder = '$folder' WHERE id = '$id'"); + + $data['response'] = $lang['srv_library_q_added']; + + // v knjiznico dodamo if/blok + } else { + $if = substr($_POST['spremenljivka'], 12); // odrezemo branching_if + + if ($if > 0) { + $id = $this->Branching->if_copy(0, $if, true); + sisplet_query("UPDATE srv_if SET folder = '$folder' WHERE id = '$id'"); + + $data['response'] = $lang['srv_library_b_added']; + } + } + } + + ob_start(); + $this->display_folders(); + $data['folders'] = ob_get_clean(); + + echo json_encode($data); + + } + + + function ajax_spr_dropped() { + global $global_user_id; + + $spremenljivka = $_POST['spremenljivka']; + $folder = $_POST['folder']; + + if ($this->tab == 0 or $this->tab == 2) + $uid = 0; + elseif ($this->tab == 1 or $this->tab == 3) + $uid = $global_user_id; + + if ($this->tip == 0) { + sisplet_query("UPDATE srv_spremenljivka SET folder = '$folder' WHERE id = '$spremenljivka'"); + } else { + sisplet_query("UPDATE srv_library_anketa SET folder = '$folder' WHERE ank_id = '$spremenljivka' AND uid='$uid'"); + } + //$this->display(); + $this->display_folders(); + } + + function ajax_if_dropped() { + global $global_user_id; + + $if = $_POST['if']; + $folder = $_POST['folder']; + + sisplet_query("UPDATE srv_if SET folder = '$folder' WHERE id = '$if'"); + + //$this->display(); + $this->display_folders(); + } + + function ajax_folder_dropped() { + + $drop = $_POST['drop']; + $folder = $_POST['folder']; + + if ($drop != $folder) + sisplet_query("UPDATE srv_library_folder SET parent = '$folder' WHERE id = '$drop' AND tip='$this->tip'"); + + //$this->display(); + $this->display_folders(); + } + + function ajax_folder_rename () { + + $folder = $_POST['folder']; + + $sql = sisplet_query("SELECT naslov FROM srv_library_folder WHERE id = '$folder'"); + $row = mysqli_fetch_array($sql); + + echo '
'; + echo ' '. + ''; + echo '
'; + + } + + function ajax_folder_newname () { + $folder = $_POST['folder']; + $naslov = $_POST['naslov']; + + sisplet_query("UPDATE srv_library_folder SET naslov='$naslov' WHERE id ='$folder'"); + + //$this->display(); + $this->display_folders(); + } + + function ajax_new_folder () { + global $lang; + global $global_user_id; + $folder = $_POST['folder']; + + if ($this->tab == 0 or $this->tab == 2) + $uid = 0; + elseif ($this->tab == 1 or $this->tab == 3) + $uid = $global_user_id; + + $uid = $_POST['uid']; + + $s = sisplet_query("INSERT INTO srv_library_folder (uid, tip, naslov, parent) VALUES ('$uid', '$this->tip', '$lang[srv_newfolder]', '$folder')"); + if (!$s) echo mysqli_error($GLOBALS['connect_db']); + $insert_id = mysqli_insert_id($GLOBALS['connect_db']); + + $_COOKIE['library_folders'] .= '-'.$insert_id.'-'; // $_COOKIE popravimo, da bo sprememba vidna tudi v display_folders() + setcookie('library_folders', $_COOKIE['library_folders'], time()+2500000); + + // $this->display(); + $this->display_folders(); + + } + + function ajax_delete_folder () { + global $lang; + + $folder = $_POST['folder']; + + $sql = sisplet_query("SELECT parent FROM srv_library_folder WHERE id = '$folder'"); + $row = mysqli_fetch_array($sql); + + if ($this->tip == 0) { + sisplet_query("UPDATE srv_spremenljivka SET folder = '$row[parent]' WHERE folder = '$folder'"); + sisplet_query("UPDATE srv_if SET folder = '$row[parent]' WHERE folder = '$folder'"); + } else { + sisplet_query("UPDATE srv_library_anketa SET folder = '$row[parent]' WHERE folder = '$folder'"); + } + + sisplet_query("UPDATE srv_library_folder SET parent = '$row[parent]' WHERE parent = '$folder'"); + + sisplet_query("DELETE FROM srv_library_folder WHERE id = '$folder'"); + + //$this->display(); + $this->display_folders(); + } + + function ajax_folder_collapsed () { + $folder = $_POST['folder']; + $collapsed = $_POST['collapsed']; + + $cookie = $_COOKIE['library_folders']; + + if ($collapsed == 0) { + $cookie .= '-'.$folder.'-'; + } else { + $cookie = str_replace('-'.$folder.'-', '', $cookie); + } + + setcookie('library_folders', $cookie, time()+2500000); + + echo ''; + } + + function ajax_library_del_anketa () { + $anketa = $_POST['anketa']; + + sisplet_query("DELETE FROM srv_library_anketa WHERE ank_id='$anketa' AND uid='0'"); + + $this->display_folders(); + } + + function ajax_library_del_myanketa () { + global $global_user_id; + + $anketa = $_POST['anketa']; + + sisplet_query("DELETE FROM srv_library_anketa WHERE ank_id='$anketa' AND uid='$global_user_id'"); + + $this->display_folders(); + } + + function ajax_library_add_myanketa () { + global $global_user_id; + + $anketa = $_POST['anketa']; + + $sql1 = sisplet_query("SELECT id FROM srv_library_folder WHERE uid='$global_user_id' AND tip='1' AND parent='0'"); + $row1 = mysqli_fetch_array($sql1); + + sisplet_query("INSERT INTO srv_library_anketa (ank_id, uid, folder) VALUES ('$anketa', '$global_user_id', '$row1[id]')"); + } + + /** + * skopira anketo cez neko ze obstojeco anketo + * + */ + function ajax_anketa_copy () { + global $global_user_id; + global $lang; + global $site_url; + $anketa = $_POST['anketa']; // nasa anketa (jo povozimo) + $ank_id = $_POST['ank_id']; // anketa, ki jo uporabimo za predlogo + + $hierarhija = (empty($_POST['hierarhija']) ? false : true); + + if($hierarhija && $ank_id == 'privzeta'){ + + $ank_id = AppSettings::getInstance()->getSetting('hierarhija-default_id'); + } + + if ($anketa > 0) { + + // preberemo osnovne podatke obstojece ankete (naslov.....) + $sql = sisplet_query("SELECT naslov, dostop FROM srv_anketa WHERE id = '$anketa'"); + $row = mysqli_fetch_array($sql); + + $sql2 = sisplet_query("SELECT naslov FROM srv_anketa WHERE id = '$ank_id'"); + $row2 = mysqli_fetch_array($sql2); + + $sqls = sisplet_query("SELECT ank_id, uid FROM srv_dostop WHERE ank_id='$anketa'"); + + $this->SurveyAdmin->anketa_delete($anketa); + + } else { + + $sql = sisplet_query("SELECT naslov, dostop FROM srv_anketa WHERE id = '$ank_id'"); + $row = mysqli_fetch_array($sql); + + $sqls = sisplet_query("SELECT ank_id, uid FROM srv_dostop WHERE ank_id='$ank_id'"); + } + + $naslov = " naslov='".(isset($_POST['naslov']) ? $_POST['naslov'] : $row['naslov'])."',"; + $intro_opomba = " intro_opomba='".(addslashes($lang['srv_library_copy_of_note'].''.$row2['naslov'].''))."',"; + + + //$new_id = $this->SurveyAdmin->anketa_copy($ank_id); + $sas = new SurveyAdminSettings(); + $new_id = $sas->anketa_copy($ank_id); + + // popravimo naslov, opombo, dostop, in novega avtorja + sisplet_query("UPDATE srv_anketa SET $naslov $intro_opomba dostop='$row[dostop]', insert_uid='$global_user_id', edit_uid='$global_user_id' WHERE id='$new_id'"); + // vsilimo refresh podatkov + SurveyInfo :: getInstance()->resetSurveyData(); + + // dostop uporabimo od stare ankete in ne od skopirane (trnutno ne kopira pravic od prej, če ustvarjamo novo anketo) + // TODO: po kakšni logiki ohranimo dostop od stare ankete?? Če jo jaz ustvarim je prav, v kolikor kopirma iz knjižnice pa tole ni ok! + if(!empty($anketa)) { + sisplet_query("DELETE FROM srv_dostop WHERE ank_id = '$new_id'"); + while ($rows = mysqli_fetch_array($sqls)) { + sisplet_query("INSERT INTO srv_dostop (ank_id, uid) VALUES ('$new_id', '$rows[uid]')"); + } + } + + // Vrnemo samo ID ankete + if($hierarhija) { + sisplet_query("INSERT INTO srv_anketa_module (ank_id, modul) VALUES ('".$new_id."', 'hierarhija')"); + sisplet_query("INSERT INTO srv_hierarhija_users (user_id, anketa_id, type) VALUES ('".$global_user_id."', '".$new_id."', 1)"); + + // Določimo vlogo + (new \Hierarhija\Hierarhija($new_id))->izrisisSistemskoVprsanjeVloga(); + + echo $new_id; + }else{ + echo 'index.php?anketa='.$new_id.'&a=branching'; + } + } + + /** + * ustvari novo kopijo ankete + * @param ank_id samo za API - prekrije tudi vse echo + */ + function ajax_anketa_copy_new ($ank_id = null) { + global $global_user_id, $lang, $site_url; + + $API_call = false; + + if($ank_id == null) { + $ank_id = $_POST['ank_id']; // anketa, ki jo uporabimo za predlogo + + // Če imamo hierarhijo in je privzeta anketa potem preverimo v settings_optional.php + if(!empty($_POST['hierarhija']) && $ank_id == 'privzeta'){ + $ank_id = AppSettings::getInstance()->getSetting('hierarhija-default_id'); + } + } + else { + $API_call = true; + } + + $sql = sisplet_query("SELECT naslov, dostop FROM srv_anketa WHERE id = '$ank_id'"); + $row = mysqli_fetch_array($sql); + + // Nastavimo naslov + if(isset($_POST['naslov']) && $_POST['naslov'] != '' && $_POST['naslov'] != $lang['srv_naslov'] && $_POST['naslov'] != $lang['srv_novaanketa_polnoime'] && trim($_POST['naslov']) != "") + $naslov = " naslov='".$_POST['naslov']."',"; + else + $naslov = " naslov='".addslashes($lang['srv_library_copy_of'].$row['naslov'])."',"; + + // Nastavimo akronim, ce ga imamo + $akronim = ""; + if(isset($_POST['akronim']) && $_POST['akronim'] != '' && $_POST['akronim'] != $lang['srv_naslov'] && $_POST['akronim'] != $lang['srv_novaanketa_ime_respondenti'] && trim($_POST['akronim']) != "") + $akronim = " akronim='".$_POST['akronim']."',"; + + $intro_opomba = " intro_opomba='".(addslashes($lang['srv_library_copy_of_note'].''.$row['naslov'].''))."',"; + + //$new_id = $this->SurveyAdmin->anketa_copy($ank_id); + $sas = new SurveyAdminSettings(); + $new_id = $sas->anketa_copy($ank_id); + + // popravimo naslov, opombo, dostop, in novega avtorja in ugasnemo email vabila + sisplet_query("UPDATE srv_anketa + SET $naslov $akronim $intro_opomba dostop='$row[dostop]', insert_uid='$global_user_id', edit_uid='$global_user_id', user_base='0' + WHERE id='$new_id'"); + + // vsilimo refresh podatkov + SurveyInfo :: getInstance()->resetSurveyData(); + + // dostop od stare ankete odstranimo + sisplet_query("DELETE FROM srv_dostop WHERE ank_id = '$new_id'"); + + //dostop dodamo uporabniku, ki si kopira anketo + sisplet_query("INSERT INTO srv_dostop (ank_id, uid) VALUES ('$new_id', '$global_user_id')"); + + // Ce imamo pri ustvarjanju doloceno tudi mapo, anketo vstavimo v njo + if(isset($_POST['folder']) && $_POST['folder'] > 0){ + + // Razpremo folder v akterega uvrscamo anketo + $sql = sisplet_query("UPDATE srv_mysurvey_folder SET open='1' WHERE id='".$_POST['folder']."' AND usr_id='".$global_user_id."'"); + + // Vstavimo anketo + $sql = sisplet_query("INSERT INTO srv_mysurvey_anketa (ank_id, usr_id, folder) VALUES ('".$new_id."', '".$global_user_id."', '".$_POST['folder']."')"); + } + + // popravimo branching, ce kopiramo staro anketo, ki ima lahko pokvarjenega + $b = new Branching($new_id); + $b->repare_branching(); + + // v kolikor je vkloplje modul evalvacija v šolah - hierarhija potem modul vključimo tudi v izbrani anketi + if(SurveyInfo::checkSurveyModule('hierarhija', $ank_id) || !empty($_POST['novaHierarhjia'])){ + sisplet_query("INSERT INTO srv_anketa_module (ank_id, modul) VALUES ('".$new_id."', 'hierarhija')"); + sisplet_query("INSERT INTO srv_hierarhija_users (user_id, anketa_id, type) VALUES ('".$global_user_id."', '".$new_id."', 1)"); + + + // Določimo vlogo + (new \Hierarhija\Hierarhija($new_id))->izrisisSistemskoVprsanjeVloga(); + + // Omenjeno funkcijo kopije strukture in preusmeritev uporabimo, kadar kopiramo obstoječe anketo skupaj s strukturo + if($_POST['hierarhija'] == 1 && empty($_POST['novaHierarhjia'])){ + // $new_id je ID nove ankete, ki je bila skopirana + // $ank_id pa je ID naše trenutne ankete + \Hierarhija\HierarhijaKopiranjeClass::getInstance($new_id)->kopirajCelotroStrukturoKNoviAnketi($ank_id); + + } + + if(empty($_POST['novaHierarhjia'])){ + echo 'index.php?anketa=' . $new_id .'&a='.A_HIERARHIJA_SUPERADMIN.'&m='.M_ADMIN_UREDI_SIFRANTE; + }else{ + echo $new_id; + } + + }else { + if(!$API_call) + echo 'index.php?anketa=' . $new_id; + } + + //vrrni id nove ankete za API + return $new_id; + } + + function ajax_if_remove () { + + $if = $_POST['if']; + $this->anketa = $_POST['anketa']; + + $BranchingAjax = new BranchingAjax($this->anketa); + // ne bomo izpisal kar izpisuje ta funkcija + ob_start(); + $BranchingAjax->ajax_if_remove($if); + ob_end_clean(); + + //$this->display(); + $this->display_folders(); + } + + function ajax_brisi_spremenljivko () { + $spremenljivka = $_POST['spremenljivka']; + + $this->SurveyAdmin->brisi_spremenljivko($spremenljivka); + + //$this->display(); + $this->display_folders(); + } + + function ajax_alert_copy_anketa () { + global $lang; + + // preverimo stevilo trenutno dodanih vprasanj ce jih ni, ni potrebno arhivirat + $sql = sisplet_query("SELECT s.id FROM srv_spremenljivka s, srv_grupa g WHERE s.gru_id=g.id AND g.ank_id='".$_POST['anketa']."'"); + if (mysqli_num_rows($sql) > 0) + { + ?> +
+
+
+
+
+
+
+ +
+
+
+
+
+
+ SurveyAdmin->anketa_copy($ank_id); + $sas = new SurveyAdminSettings(); + $new_id = $sas->anketa_copy($ank_id); + + $intro_opomba = addslashes( $lang['srv_library_copy_of_note'].''.$row2['naslov'].'' ); + + // popravimo polja + sisplet_query("UPDATE srv_anketa SET naslov='$row[naslov]', intro_opomba='$intro_opomba', dostop='$row[dostop]', insert_uid='$global_user_id', insert_time=NOW(), edit_uid='$global_user_id', edit_time=NOW() WHERE id='$new_id'"); + + // dostop uporabimo od stare ankete in ne od skopirane + sisplet_query("DELETE FROM srv_dostop WHERE ank_id = '$new_id'"); + while ($rows = mysqli_fetch_array($sqls)) { + sisplet_query("INSERT INTO srv_dostop (ank_id, uid) VALUES ('$new_id', '$rows[uid]')"); + } + + // staro anketo razglasimo kot backup(arhiv) nove + sisplet_query("UPDATE srv_anketa SET backup='$new_id', active=0, edit_uid='$global_user_id', edit_time=NOW(), naslov = CONCAT( naslov, ' ', DAY(NOW()), '.', MONTH(NOW()), '.', YEAR(NOW()) ) WHERE id='$anketa'"); + // vsilimo refresh podatkov + SurveyInfo :: getInstance()->resetSurveyData(); + + // redirektamo na novo anketo + echo 'index.php?anketa='.$new_id; + } + + function repareTabs() { + if ($this->tab >= 2) + $this->tip = 1; + else + $this->tip = 0; + + // popravimo tabe če smo v glasovanju ali formi + if ($this->mode < 2) { + // uredimo tabe + if ($this->tab==0 || $this->tab==1) { + $this->tip = 1; + $this->tab=2; + } + } + } + +} + +?> diff --git a/composer.lock b/composer.lock index 5a1df5bca..0ec54a920 100644 --- a/composer.lock +++ b/composer.lock @@ -84,24 +84,24 @@ }, { "name": "fgrosse/phpasn1", - "version": "v2.3.0", + "version": "v2.4.0", "source": { "type": "git", "url": "https://github.com/fgrosse/PHPASN1.git", - "reference": "20299033c35f4300eb656e7e8e88cf52d1d6694e" + "reference": "eef488991d53e58e60c9554b09b1201ca5ba9296" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fgrosse/PHPASN1/zipball/20299033c35f4300eb656e7e8e88cf52d1d6694e", - "reference": "20299033c35f4300eb656e7e8e88cf52d1d6694e", + "url": "https://api.github.com/repos/fgrosse/PHPASN1/zipball/eef488991d53e58e60c9554b09b1201ca5ba9296", + "reference": "eef488991d53e58e60c9554b09b1201ca5ba9296", "shasum": "" }, "require": { - "php": ">=7.0.0" + "php": "~7.1.0 || ~7.2.0 || ~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0" }, "require-dev": { - "phpunit/phpunit": "~6.3", - "satooshi/php-coveralls": "~2.0" + "php-coveralls/php-coveralls": "~2.0", + "phpunit/phpunit": "^6.3 || ^7.0 || ^8.0" }, "suggest": { "ext-bcmath": "BCmath is the fallback extension for big integer calculations", @@ -153,9 +153,9 @@ ], "support": { "issues": "https://github.com/fgrosse/PHPASN1/issues", - "source": "https://github.com/fgrosse/PHPASN1/tree/v2.3.0" + "source": "https://github.com/fgrosse/PHPASN1/tree/v2.4.0" }, - "time": "2021-04-24T19:01:55+00:00" + "time": "2021-12-11T12:41:06+00:00" }, { "name": "geoip2/geoip2", @@ -251,12 +251,12 @@ } }, "autoload": { - "psr-4": { - "GuzzleHttp\\": "src/" - }, "files": [ "src/functions_include.php" - ] + ], + "psr-4": { + "GuzzleHttp\\": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -406,12 +406,12 @@ } }, "autoload": { - "psr-4": { - "GuzzleHttp\\Psr7\\": "src/" - }, "files": [ "src/functions_include.php" - ] + ], + "psr-4": { + "GuzzleHttp\\Psr7\\": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -814,8 +814,8 @@ "type": "library", "autoload": { "psr-4": { - "PayPalCheckoutSdk\\": "lib/PayPalCheckoutSdk", - "Sample\\": "samples/" + "Sample\\": "samples/", + "PayPalCheckoutSdk\\": "lib/PayPalCheckoutSdk" } }, "notification-url": "https://packagist.org/downloads/", @@ -888,16 +888,16 @@ }, { "name": "phpmailer/phpmailer", - "version": "v6.5.3", + "version": "v6.5.4", "source": { "type": "git", "url": "https://github.com/PHPMailer/PHPMailer.git", - "reference": "baeb7cde6b60b1286912690ab0693c7789a31e71" + "reference": "c0d9f7dd3c2aa247ca44791e9209233829d82285" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/baeb7cde6b60b1286912690ab0693c7789a31e71", - "reference": "baeb7cde6b60b1286912690ab0693c7789a31e71", + "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/c0d9f7dd3c2aa247ca44791e9209233829d82285", + "reference": "c0d9f7dd3c2aa247ca44791e9209233829d82285", "shasum": "" }, "require": { @@ -910,10 +910,10 @@ "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0", "doctrine/annotations": "^1.2", "php-parallel-lint/php-console-highlighter": "^0.5.0", - "php-parallel-lint/php-parallel-lint": "^1.3", + "php-parallel-lint/php-parallel-lint": "^1.3.1", "phpcompatibility/php-compatibility": "^9.3.5", "roave/security-advisories": "dev-latest", - "squizlabs/php_codesniffer": "^3.6.0", + "squizlabs/php_codesniffer": "^3.6.2", "yoast/phpunit-polyfills": "^1.0.0" }, "suggest": { @@ -954,7 +954,7 @@ "description": "PHPMailer is a full-featured email creation and transfer class for PHP", "support": { "issues": "https://github.com/PHPMailer/PHPMailer/issues", - "source": "https://github.com/PHPMailer/PHPMailer/tree/v6.5.3" + "source": "https://github.com/PHPMailer/PHPMailer/tree/v6.5.4" }, "funding": [ { @@ -962,7 +962,7 @@ "type": "github" } ], - "time": "2021-11-25T16:34:11+00:00" + "time": "2022-02-17T08:19:04+00:00" }, { "name": "psr/http-message", @@ -1208,16 +1208,16 @@ }, { "name": "stripe/stripe-php", - "version": "v7.105.0", + "version": "v7.114.0", "source": { "type": "git", "url": "https://github.com/stripe/stripe-php.git", - "reference": "3a926610ca772aa7519fb132c88a6e7472788d90" + "reference": "63be231686c6874befb5b3a47fb8effb4c30b78b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/stripe/stripe-php/zipball/3a926610ca772aa7519fb132c88a6e7472788d90", - "reference": "3a926610ca772aa7519fb132c88a6e7472788d90", + "url": "https://api.github.com/repos/stripe/stripe-php/zipball/63be231686c6874befb5b3a47fb8effb4c30b78b", + "reference": "63be231686c6874befb5b3a47fb8effb4c30b78b", "shasum": "" }, "require": { @@ -1227,7 +1227,7 @@ "php": ">=5.6.0" }, "require-dev": { - "friendsofphp/php-cs-fixer": "3.2.1", + "friendsofphp/php-cs-fixer": "3.5.0", "phpstan/phpstan": "^1.2", "phpunit/phpunit": "^5.7 || ^9.0", "squizlabs/php_codesniffer": "^3.3" @@ -1262,22 +1262,22 @@ ], "support": { "issues": "https://github.com/stripe/stripe-php/issues", - "source": "https://github.com/stripe/stripe-php/tree/v7.105.0" + "source": "https://github.com/stripe/stripe-php/tree/v7.114.0" }, - "time": "2021-12-06T22:51:55+00:00" + "time": "2022-02-15T22:48:31+00:00" }, { "name": "symfony/polyfill-intl-idn", - "version": "v1.23.0", + "version": "v1.24.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "65bd267525e82759e7d8c4e8ceea44f398838e65" + "reference": "749045c69efb97c70d25d7463abba812e91f3a44" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/65bd267525e82759e7d8c4e8ceea44f398838e65", - "reference": "65bd267525e82759e7d8c4e8ceea44f398838e65", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/749045c69efb97c70d25d7463abba812e91f3a44", + "reference": "749045c69efb97c70d25d7463abba812e91f3a44", "shasum": "" }, "require": { @@ -1299,12 +1299,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Intl\\Idn\\": "" - }, "files": [ "bootstrap.php" - ] + ], + "psr-4": { + "Symfony\\Polyfill\\Intl\\Idn\\": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1335,7 +1335,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.23.0" + "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.24.0" }, "funding": [ { @@ -1351,11 +1351,11 @@ "type": "tidelift" } ], - "time": "2021-05-27T09:27:20+00:00" + "time": "2021-09-14T14:02:44+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.23.0", + "version": "v1.24.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", @@ -1384,12 +1384,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Intl\\Normalizer\\": "" - }, "files": [ "bootstrap.php" ], + "psr-4": { + "Symfony\\Polyfill\\Intl\\Normalizer\\": "" + }, "classmap": [ "Resources/stubs" ] @@ -1419,7 +1419,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.23.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.24.0" }, "funding": [ { @@ -1439,7 +1439,7 @@ }, { "name": "symfony/polyfill-php72", - "version": "v1.23.0", + "version": "v1.24.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php72.git", @@ -1465,12 +1465,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php72\\": "" - }, "files": [ "bootstrap.php" - ] + ], + "psr-4": { + "Symfony\\Polyfill\\Php72\\": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1495,7 +1495,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php72/tree/v1.23.0" + "source": "https://github.com/symfony/polyfill-php72/tree/v1.24.0" }, "funding": [ { @@ -2234,16 +2234,16 @@ "packages-dev": [ { "name": "filp/whoops", - "version": "2.14.4", + "version": "2.14.5", "source": { "type": "git", "url": "https://github.com/filp/whoops.git", - "reference": "f056f1fe935d9ed86e698905a957334029899895" + "reference": "a63e5e8f26ebbebf8ed3c5c691637325512eb0dc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filp/whoops/zipball/f056f1fe935d9ed86e698905a957334029899895", - "reference": "f056f1fe935d9ed86e698905a957334029899895", + "url": "https://api.github.com/repos/filp/whoops/zipball/a63e5e8f26ebbebf8ed3c5c691637325512eb0dc", + "reference": "a63e5e8f26ebbebf8ed3c5c691637325512eb0dc", "shasum": "" }, "require": { @@ -2293,7 +2293,7 @@ ], "support": { "issues": "https://github.com/filp/whoops/issues", - "source": "https://github.com/filp/whoops/tree/2.14.4" + "source": "https://github.com/filp/whoops/tree/2.14.5" }, "funding": [ { @@ -2301,7 +2301,7 @@ "type": "github" } ], - "time": "2021-10-03T12:00:00+00:00" + "time": "2022-01-07T12:00:00+00:00" }, { "name": "kint-php/kint", @@ -2360,25 +2360,26 @@ }, { "name": "maximebf/debugbar", - "version": "v1.17.3", + "version": "v1.18.0", "source": { "type": "git", "url": "https://github.com/maximebf/php-debugbar.git", - "reference": "e8ac3499af0ea5b440908e06cc0abe5898008b3c" + "reference": "0d44b75f3b5d6d41ae83b79c7a4bceae7fbc78b6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/e8ac3499af0ea5b440908e06cc0abe5898008b3c", - "reference": "e8ac3499af0ea5b440908e06cc0abe5898008b3c", + "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/0d44b75f3b5d6d41ae83b79c7a4bceae7fbc78b6", + "reference": "0d44b75f3b5d6d41ae83b79c7a4bceae7fbc78b6", "shasum": "" }, "require": { "php": "^7.1|^8", "psr/log": "^1|^2|^3", - "symfony/var-dumper": "^2.6|^3|^4|^5" + "symfony/var-dumper": "^2.6|^3|^4|^5|^6" }, "require-dev": { - "phpunit/phpunit": "^7.5.20 || ^9.4.2" + "phpunit/phpunit": "^7.5.20 || ^9.4.2", + "twig/twig": "^1.38|^2.7|^3.0" }, "suggest": { "kriswallsmith/assetic": "The best way to manage assets", @@ -2419,9 +2420,9 @@ ], "support": { "issues": "https://github.com/maximebf/php-debugbar/issues", - "source": "https://github.com/maximebf/php-debugbar/tree/v1.17.3" + "source": "https://github.com/maximebf/php-debugbar/tree/v1.18.0" }, - "time": "2021-10-19T12:33:27+00:00" + "time": "2021-12-27T18:49:48+00:00" }, { "name": "psr/log", @@ -2475,21 +2476,24 @@ }, { "name": "symfony/polyfill-mbstring", - "version": "v1.23.1", + "version": "v1.24.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "9174a3d80210dca8daa7f31fec659150bbeabfc6" + "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9174a3d80210dca8daa7f31fec659150bbeabfc6", - "reference": "9174a3d80210dca8daa7f31fec659150bbeabfc6", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/0abb51d2f102e00a4eefcf46ba7fec406d245825", + "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825", "shasum": "" }, "require": { "php": ">=7.1" }, + "provide": { + "ext-mbstring": "*" + }, "suggest": { "ext-mbstring": "For best performance" }, @@ -2504,12 +2508,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Mbstring\\": "" - }, "files": [ "bootstrap.php" - ] + ], + "psr-4": { + "Symfony\\Polyfill\\Mbstring\\": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -2535,7 +2539,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.23.1" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.24.0" }, "funding": [ { @@ -2551,20 +2555,20 @@ "type": "tidelift" } ], - "time": "2021-05-27T12:26:48+00:00" + "time": "2021-11-30T18:21:41+00:00" }, { "name": "symfony/polyfill-php80", - "version": "v1.23.1", + "version": "v1.24.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "1100343ed1a92e3a38f9ae122fc0eb21602547be" + "reference": "57b712b08eddb97c762a8caa32c84e037892d2e9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/1100343ed1a92e3a38f9ae122fc0eb21602547be", - "reference": "1100343ed1a92e3a38f9ae122fc0eb21602547be", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/57b712b08eddb97c762a8caa32c84e037892d2e9", + "reference": "57b712b08eddb97c762a8caa32c84e037892d2e9", "shasum": "" }, "require": { @@ -2581,12 +2585,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php80\\": "" - }, "files": [ "bootstrap.php" ], + "psr-4": { + "Symfony\\Polyfill\\Php80\\": "" + }, "classmap": [ "Resources/stubs" ] @@ -2618,7 +2622,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.23.1" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.24.0" }, "funding": [ { @@ -2634,20 +2638,20 @@ "type": "tidelift" } ], - "time": "2021-07-28T13:41:28+00:00" + "time": "2021-09-13T13:58:33+00:00" }, { "name": "symfony/var-dumper", - "version": "v4.4.34", + "version": "v4.4.37", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "2d0c056b2faaa3d785bdbd5adecc593a5be9c16e" + "reference": "e74eee4ec02de71db3d60151aa5b203c990556df" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/2d0c056b2faaa3d785bdbd5adecc593a5be9c16e", - "reference": "2d0c056b2faaa3d785bdbd5adecc593a5be9c16e", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/e74eee4ec02de71db3d60151aa5b203c990556df", + "reference": "e74eee4ec02de71db3d60151aa5b203c990556df", "shasum": "" }, "require": { @@ -2707,7 +2711,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v4.4.34" + "source": "https://github.com/symfony/var-dumper/tree/v4.4.37" }, "funding": [ { @@ -2723,7 +2727,7 @@ "type": "tidelift" } ], - "time": "2021-11-12T10:50:54+00:00" + "time": "2022-01-02T09:41:36+00:00" } ], "aliases": [], diff --git a/public/css/admin_new.css b/public/css/admin_new.css index e0eeb2d46..3dbc729df 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -8292,7 +8292,7 @@ header #topSettingsHolder .left_options_holder #analizaSubNav { margin-right: 32px; } header #topSettingsHolder .left_options_holder #analizaSubNav span { - font-size: 14px !important; + font-size: 14px; line-height: 18px; } header #topSettingsHolder .left_options_holder #analizaSubNav #globalSetingsLinks.analiza { @@ -16837,14 +16837,16 @@ iframe#ifmcontentstoprint { #srv_analiza_preview_div .srv_analiza_preview_sub .title { margin-bottom: 16px; padding-bottom: 8px; - font-size: 16px; + font-size: 14px; border-bottom: 1px #E5E5E5 solid; } #srv_analiza_preview_div .srv_analiza_preview_sub .title .first { + font-size: 16px !important; font-weight: 600; text-transform: uppercase; } #srv_analiza_preview_div .srv_analiza_preview_sub .title .faicon { + font-size: 16px !important; margin-right: 8px; color: #1E88E5; } diff --git a/resources/sass/admin_new/components/header/navigation.scss b/resources/sass/admin_new/components/header/navigation.scss index 85efdc106..3e9ad8532 100644 --- a/resources/sass/admin_new/components/header/navigation.scss +++ b/resources/sass/admin_new/components/header/navigation.scss @@ -311,7 +311,7 @@ header{ margin-right: 32px; span{ - font-size: 14px !important; + font-size: 14px; line-height: 18px; } diff --git a/resources/sass/admin_new/pages/survey_analysis/preview.scss b/resources/sass/admin_new/pages/survey_analysis/preview.scss index bca1585c4..f79efebc1 100644 --- a/resources/sass/admin_new/pages/survey_analysis/preview.scss +++ b/resources/sass/admin_new/pages/survey_analysis/preview.scss @@ -28,16 +28,18 @@ margin-bottom: 16px; padding-bottom: 8px; - font-size: 16px; + font-size: 14px; border-bottom: 1px $gray solid; .first{ + font-size: 16px !important; font-weight: 600; text-transform: uppercase; } .faicon{ + font-size: 16px !important; margin-right: 8px; color: $blue; } diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index 14d0a44b4..c55479ec5 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -568,6 +568,7 @@ return array( 'LatexSurvey' => $baseDir . '/admin/survey/export/latexclasses/class.LatexSurvey.php', 'LatexSurveyElement' => $baseDir . '/admin/survey/export/latexclasses/class.LatexSurveyElement.php', 'Library' => $baseDir . '/admin/survey/classes/class.Library.php', + 'LibraryBranching' => $baseDir . '/admin/survey/classes/class.LibraryBranching.php', 'LokacijaLatex' => $baseDir . '/admin/survey/export/latexclasses/Vprasanja/LokacijaLatex.php', 'MAZA' => $baseDir . '/admin/survey/modules/mod_MAZA/class.MAZA.php', 'MAZAExport' => $baseDir . '/admin/survey/modules/mod_MAZA/class.MAZAExport.php', @@ -778,6 +779,7 @@ return array( 'Stripe\\OrderItem' => $vendorDir . '/stripe/stripe-php/lib/OrderItem.php', 'Stripe\\OrderReturn' => $vendorDir . '/stripe/stripe-php/lib/OrderReturn.php', 'Stripe\\PaymentIntent' => $vendorDir . '/stripe/stripe-php/lib/PaymentIntent.php', + 'Stripe\\PaymentLink' => $vendorDir . '/stripe/stripe-php/lib/PaymentLink.php', 'Stripe\\PaymentMethod' => $vendorDir . '/stripe/stripe-php/lib/PaymentMethod.php', 'Stripe\\Payout' => $vendorDir . '/stripe/stripe-php/lib/Payout.php', 'Stripe\\Person' => $vendorDir . '/stripe/stripe-php/lib/Person.php', @@ -838,6 +840,7 @@ return array( 'Stripe\\Service\\OrderReturnService' => $vendorDir . '/stripe/stripe-php/lib/Service/OrderReturnService.php', 'Stripe\\Service\\OrderService' => $vendorDir . '/stripe/stripe-php/lib/Service/OrderService.php', 'Stripe\\Service\\PaymentIntentService' => $vendorDir . '/stripe/stripe-php/lib/Service/PaymentIntentService.php', + 'Stripe\\Service\\PaymentLinkService' => $vendorDir . '/stripe/stripe-php/lib/Service/PaymentLinkService.php', 'Stripe\\Service\\PaymentMethodService' => $vendorDir . '/stripe/stripe-php/lib/Service/PaymentMethodService.php', 'Stripe\\Service\\PayoutService' => $vendorDir . '/stripe/stripe-php/lib/Service/PayoutService.php', 'Stripe\\Service\\PlanService' => $vendorDir . '/stripe/stripe-php/lib/Service/PlanService.php', diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index ed99a1d42..54d5e7fe8 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -772,6 +772,7 @@ class ComposerStaticInit6b03163c371c5541881b55b762b8c779 'LatexSurvey' => __DIR__ . '/../..' . '/admin/survey/export/latexclasses/class.LatexSurvey.php', 'LatexSurveyElement' => __DIR__ . '/../..' . '/admin/survey/export/latexclasses/class.LatexSurveyElement.php', 'Library' => __DIR__ . '/../..' . '/admin/survey/classes/class.Library.php', + 'LibraryBranching' => __DIR__ . '/../..' . '/admin/survey/classes/class.LibraryBranching.php', 'LokacijaLatex' => __DIR__ . '/../..' . '/admin/survey/export/latexclasses/Vprasanja/LokacijaLatex.php', 'MAZA' => __DIR__ . '/../..' . '/admin/survey/modules/mod_MAZA/class.MAZA.php', 'MAZAExport' => __DIR__ . '/../..' . '/admin/survey/modules/mod_MAZA/class.MAZAExport.php', @@ -982,6 +983,7 @@ class ComposerStaticInit6b03163c371c5541881b55b762b8c779 'Stripe\\OrderItem' => __DIR__ . '/..' . '/stripe/stripe-php/lib/OrderItem.php', 'Stripe\\OrderReturn' => __DIR__ . '/..' . '/stripe/stripe-php/lib/OrderReturn.php', 'Stripe\\PaymentIntent' => __DIR__ . '/..' . '/stripe/stripe-php/lib/PaymentIntent.php', + 'Stripe\\PaymentLink' => __DIR__ . '/..' . '/stripe/stripe-php/lib/PaymentLink.php', 'Stripe\\PaymentMethod' => __DIR__ . '/..' . '/stripe/stripe-php/lib/PaymentMethod.php', 'Stripe\\Payout' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Payout.php', 'Stripe\\Person' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Person.php', @@ -1042,6 +1044,7 @@ class ComposerStaticInit6b03163c371c5541881b55b762b8c779 'Stripe\\Service\\OrderReturnService' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/OrderReturnService.php', 'Stripe\\Service\\OrderService' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/OrderService.php', 'Stripe\\Service\\PaymentIntentService' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/PaymentIntentService.php', + 'Stripe\\Service\\PaymentLinkService' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/PaymentLinkService.php', 'Stripe\\Service\\PaymentMethodService' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/PaymentMethodService.php', 'Stripe\\Service\\PayoutService' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/PayoutService.php', 'Stripe\\Service\\PlanService' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/PlanService.php', diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 942fdcf52..d2abeadcb 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -81,25 +81,25 @@ }, { "name": "fgrosse/phpasn1", - "version": "v2.3.0", - "version_normalized": "2.3.0.0", + "version": "v2.4.0", + "version_normalized": "2.4.0.0", "source": { "type": "git", "url": "https://github.com/fgrosse/PHPASN1.git", - "reference": "20299033c35f4300eb656e7e8e88cf52d1d6694e" + "reference": "eef488991d53e58e60c9554b09b1201ca5ba9296" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fgrosse/PHPASN1/zipball/20299033c35f4300eb656e7e8e88cf52d1d6694e", - "reference": "20299033c35f4300eb656e7e8e88cf52d1d6694e", + "url": "https://api.github.com/repos/fgrosse/PHPASN1/zipball/eef488991d53e58e60c9554b09b1201ca5ba9296", + "reference": "eef488991d53e58e60c9554b09b1201ca5ba9296", "shasum": "" }, "require": { - "php": ">=7.0.0" + "php": "~7.1.0 || ~7.2.0 || ~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0" }, "require-dev": { - "phpunit/phpunit": "~6.3", - "satooshi/php-coveralls": "~2.0" + "php-coveralls/php-coveralls": "~2.0", + "phpunit/phpunit": "^6.3 || ^7.0 || ^8.0" }, "suggest": { "ext-bcmath": "BCmath is the fallback extension for big integer calculations", @@ -107,7 +107,7 @@ "ext-gmp": "GMP is the preferred extension for big integer calculations", "phpseclib/bcmath_compat": "BCmath polyfill for servers where neither GMP nor BCmath is available" }, - "time": "2021-04-24T19:01:55+00:00", + "time": "2021-12-11T12:41:06+00:00", "type": "library", "extra": { "branch-alias": { @@ -151,6 +151,10 @@ "x509", "x690" ], + "support": { + "issues": "https://github.com/fgrosse/PHPASN1/issues", + "source": "https://github.com/fgrosse/PHPASN1/tree/v2.4.0" + }, "install-path": "../fgrosse/phpasn1" }, { @@ -900,17 +904,17 @@ }, { "name": "phpmailer/phpmailer", - "version": "v6.5.3", - "version_normalized": "6.5.3.0", + "version": "v6.5.4", + "version_normalized": "6.5.4.0", "source": { "type": "git", "url": "https://github.com/PHPMailer/PHPMailer.git", - "reference": "baeb7cde6b60b1286912690ab0693c7789a31e71" + "reference": "c0d9f7dd3c2aa247ca44791e9209233829d82285" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/baeb7cde6b60b1286912690ab0693c7789a31e71", - "reference": "baeb7cde6b60b1286912690ab0693c7789a31e71", + "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/c0d9f7dd3c2aa247ca44791e9209233829d82285", + "reference": "c0d9f7dd3c2aa247ca44791e9209233829d82285", "shasum": "" }, "require": { @@ -923,10 +927,10 @@ "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0", "doctrine/annotations": "^1.2", "php-parallel-lint/php-console-highlighter": "^0.5.0", - "php-parallel-lint/php-parallel-lint": "^1.3", + "php-parallel-lint/php-parallel-lint": "^1.3.1", "phpcompatibility/php-compatibility": "^9.3.5", "roave/security-advisories": "dev-latest", - "squizlabs/php_codesniffer": "^3.6.0", + "squizlabs/php_codesniffer": "^3.6.2", "yoast/phpunit-polyfills": "^1.0.0" }, "suggest": { @@ -937,7 +941,7 @@ "stevenmaguire/oauth2-microsoft": "Needed for Microsoft XOAUTH2 authentication", "symfony/polyfill-mbstring": "To support UTF-8 if the Mbstring PHP extension is not enabled (^1.2)" }, - "time": "2021-11-25T16:34:11+00:00", + "time": "2022-02-17T08:19:04+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -969,7 +973,7 @@ "description": "PHPMailer is a full-featured email creation and transfer class for PHP", "support": { "issues": "https://github.com/PHPMailer/PHPMailer/issues", - "source": "https://github.com/PHPMailer/PHPMailer/tree/v6.5.3" + "source": "https://github.com/PHPMailer/PHPMailer/tree/v6.5.4" }, "funding": [ { @@ -1213,17 +1217,17 @@ }, { "name": "stripe/stripe-php", - "version": "v7.105.0", - "version_normalized": "7.105.0.0", + "version": "v7.114.0", + "version_normalized": "7.114.0.0", "source": { "type": "git", "url": "https://github.com/stripe/stripe-php.git", - "reference": "3a926610ca772aa7519fb132c88a6e7472788d90" + "reference": "63be231686c6874befb5b3a47fb8effb4c30b78b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/stripe/stripe-php/zipball/3a926610ca772aa7519fb132c88a6e7472788d90", - "reference": "3a926610ca772aa7519fb132c88a6e7472788d90", + "url": "https://api.github.com/repos/stripe/stripe-php/zipball/63be231686c6874befb5b3a47fb8effb4c30b78b", + "reference": "63be231686c6874befb5b3a47fb8effb4c30b78b", "shasum": "" }, "require": { @@ -1233,12 +1237,12 @@ "php": ">=5.6.0" }, "require-dev": { - "friendsofphp/php-cs-fixer": "3.2.1", + "friendsofphp/php-cs-fixer": "3.5.0", "phpstan/phpstan": "^1.2", "phpunit/phpunit": "^5.7 || ^9.0", "squizlabs/php_codesniffer": "^3.3" }, - "time": "2021-12-06T22:51:55+00:00", + "time": "2022-02-15T22:48:31+00:00", "type": "library", "extra": { "branch-alias": { @@ -1270,23 +1274,23 @@ ], "support": { "issues": "https://github.com/stripe/stripe-php/issues", - "source": "https://github.com/stripe/stripe-php/tree/v7.105.0" + "source": "https://github.com/stripe/stripe-php/tree/v7.114.0" }, "install-path": "../stripe/stripe-php" }, { "name": "symfony/polyfill-intl-idn", - "version": "v1.23.0", - "version_normalized": "1.23.0.0", + "version": "v1.24.0", + "version_normalized": "1.24.0.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "65bd267525e82759e7d8c4e8ceea44f398838e65" + "reference": "749045c69efb97c70d25d7463abba812e91f3a44" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/65bd267525e82759e7d8c4e8ceea44f398838e65", - "reference": "65bd267525e82759e7d8c4e8ceea44f398838e65", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/749045c69efb97c70d25d7463abba812e91f3a44", + "reference": "749045c69efb97c70d25d7463abba812e91f3a44", "shasum": "" }, "require": { @@ -1297,7 +1301,7 @@ "suggest": { "ext-intl": "For best performance" }, - "time": "2021-05-27T09:27:20+00:00", + "time": "2021-09-14T14:02:44+00:00", "type": "library", "extra": { "branch-alias": { @@ -1310,12 +1314,12 @@ }, "installation-source": "dist", "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Intl\\Idn\\": "" - }, "files": [ "bootstrap.php" - ] + ], + "psr-4": { + "Symfony\\Polyfill\\Intl\\Idn\\": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1346,7 +1350,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.23.0" + "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.24.0" }, "funding": [ { @@ -1366,8 +1370,8 @@ }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.23.0", - "version_normalized": "1.23.0.0", + "version": "v1.24.0", + "version_normalized": "1.24.0.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", @@ -1398,12 +1402,12 @@ }, "installation-source": "dist", "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Intl\\Normalizer\\": "" - }, "files": [ "bootstrap.php" ], + "psr-4": { + "Symfony\\Polyfill\\Intl\\Normalizer\\": "" + }, "classmap": [ "Resources/stubs" ] @@ -1433,7 +1437,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.23.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.24.0" }, "funding": [ { @@ -1453,8 +1457,8 @@ }, { "name": "symfony/polyfill-php72", - "version": "v1.23.0", - "version_normalized": "1.23.0.0", + "version": "v1.24.0", + "version_normalized": "1.24.0.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php72.git", @@ -1482,12 +1486,12 @@ }, "installation-source": "dist", "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php72\\": "" - }, "files": [ "bootstrap.php" - ] + ], + "psr-4": { + "Symfony\\Polyfill\\Php72\\": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1512,7 +1516,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php72/tree/v1.23.0" + "source": "https://github.com/symfony/polyfill-php72/tree/v1.24.0" }, "funding": [ { diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php index 27e7fa36c..ee12e2c89 100644 --- a/vendor/composer/installed.php +++ b/vendor/composer/installed.php @@ -5,7 +5,7 @@ 'type' => 'project', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), - 'reference' => '01747093b15bd2fd1afc5757a1466d4c4bf1dd3d', + 'reference' => '7ef2de91b37a2ff1ee48d8f7e529d3b34f2b754d', 'name' => '1ka/1ka.si', 'dev' => false, ), @@ -16,7 +16,7 @@ 'type' => 'project', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), - 'reference' => '01747093b15bd2fd1afc5757a1466d4c4bf1dd3d', + 'reference' => '7ef2de91b37a2ff1ee48d8f7e529d3b34f2b754d', 'dev_requirement' => false, ), 'composer/ca-bundle' => array( @@ -29,12 +29,12 @@ 'dev_requirement' => false, ), 'fgrosse/phpasn1' => array( - 'pretty_version' => 'v2.3.0', - 'version' => '2.3.0.0', + 'pretty_version' => 'v2.4.0', + 'version' => '2.4.0.0', 'type' => 'library', 'install_path' => __DIR__ . '/../fgrosse/phpasn1', 'aliases' => array(), - 'reference' => '20299033c35f4300eb656e7e8e88cf52d1d6694e', + 'reference' => 'eef488991d53e58e60c9554b09b1201ca5ba9296', 'dev_requirement' => false, ), 'geoip2/geoip2' => array( @@ -137,12 +137,12 @@ 'dev_requirement' => false, ), 'phpmailer/phpmailer' => array( - 'pretty_version' => 'v6.5.3', - 'version' => '6.5.3.0', + 'pretty_version' => 'v6.5.4', + 'version' => '6.5.4.0', 'type' => 'library', 'install_path' => __DIR__ . '/../phpmailer/phpmailer', 'aliases' => array(), - 'reference' => 'baeb7cde6b60b1286912690ab0693c7789a31e71', + 'reference' => 'c0d9f7dd3c2aa247ca44791e9209233829d82285', 'dev_requirement' => false, ), 'psr/http-message' => array( @@ -188,26 +188,26 @@ 'dev_requirement' => false, ), 'stripe/stripe-php' => array( - 'pretty_version' => 'v7.105.0', - 'version' => '7.105.0.0', + 'pretty_version' => 'v7.114.0', + 'version' => '7.114.0.0', 'type' => 'library', 'install_path' => __DIR__ . '/../stripe/stripe-php', 'aliases' => array(), - 'reference' => '3a926610ca772aa7519fb132c88a6e7472788d90', + 'reference' => '63be231686c6874befb5b3a47fb8effb4c30b78b', 'dev_requirement' => false, ), 'symfony/polyfill-intl-idn' => array( - 'pretty_version' => 'v1.23.0', - 'version' => '1.23.0.0', + 'pretty_version' => 'v1.24.0', + 'version' => '1.24.0.0', 'type' => 'library', 'install_path' => __DIR__ . '/../symfony/polyfill-intl-idn', 'aliases' => array(), - 'reference' => '65bd267525e82759e7d8c4e8ceea44f398838e65', + 'reference' => '749045c69efb97c70d25d7463abba812e91f3a44', 'dev_requirement' => false, ), 'symfony/polyfill-intl-normalizer' => array( - 'pretty_version' => 'v1.23.0', - 'version' => '1.23.0.0', + 'pretty_version' => 'v1.24.0', + 'version' => '1.24.0.0', 'type' => 'library', 'install_path' => __DIR__ . '/../symfony/polyfill-intl-normalizer', 'aliases' => array(), @@ -215,8 +215,8 @@ 'dev_requirement' => false, ), 'symfony/polyfill-php72' => array( - 'pretty_version' => 'v1.23.0', - 'version' => '1.23.0.0', + 'pretty_version' => 'v1.24.0', + 'version' => '1.24.0.0', 'type' => 'library', 'install_path' => __DIR__ . '/../symfony/polyfill-php72', 'aliases' => array(), diff --git a/vendor/fgrosse/phpasn1/.github/workflows/phpunit.yml b/vendor/fgrosse/phpasn1/.github/workflows/phpunit.yml new file mode 100644 index 000000000..556e105d2 --- /dev/null +++ b/vendor/fgrosse/phpasn1/.github/workflows/phpunit.yml @@ -0,0 +1,35 @@ +name: PHPUnit + +on: + push: + branches: + - master + pull_request: + +jobs: + phpunit: + name: PHPUnit + runs-on: ubuntu-latest + strategy: + matrix: + php: + - '7.1' + - '7.2' + - '7.3' + - '7.4' + - '8.0' + - '8.1' + steps: + - uses: shivammathur/setup-php@v2 + with: + php-version: ${{ matrix.php }} + coverage: none + extensions: gmp, bcmath + tools: composer + - uses: actions/checkout@v2 + - name: Setup problem matchers + run: | + echo "::add-matcher::${{ runner.tool_cache }}/php.json" + echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json" + - run: composer install + - run: vendor/bin/phpunit diff --git a/vendor/fgrosse/phpasn1/CHANGELOG.md b/vendor/fgrosse/phpasn1/CHANGELOG.md index 5a5f5caee..f7b4663cb 100644 --- a/vendor/fgrosse/phpasn1/CHANGELOG.md +++ b/vendor/fgrosse/phpasn1/CHANGELOG.md @@ -1,6 +1,11 @@ +#### v2.4.0 (2021-12) +* Drop support for PHP 7.0 [#89](https://github.com/fgrosse/PHPASN1/pull/89) + +#### v2.3.1 (2021-12) +* Add `#[\ReturnTypeWillChange]` attributes for PHP 8.1 compatibility [#87](https://github.com/fgrosse/PHPASN1/pull/87) + #### v2.3.0 (2021-04) -* Allow creating an unsigned CSR and adding the signature later - https://github.com/fgrosse/PHPASN1/pull/82 +* Allow creating an unsigned CSR and adding the signature later [#82](https://github.com/fgrosse/PHPASN1/pull/82) #### v2.2.0 (2020-08) * support polyfills for bcmath and gmp, and add a composer.json @@ -12,8 +17,7 @@ by wycheproof test suite #### v.2.1.0 (2018-03) -* add support for `bcmath` extension (making `gmp` optional)
- https://github.com/fgrosse/PHPASN1/pull/68 +* add support for `bcmath` extension (making `gmp` optional) [#68](https://github.com/fgrosse/PHPASN1/pull/68) #### v.2.0.1 & v.1.5.3 (2017-12) * add .gitattributes file to prevent examples and tests to be installed via composer when --prefer-dist was set @@ -39,7 +43,7 @@ * fix a bug that would prevent you from decoding empty tagged objects [#57](https://github.com/fgrosse/PHPASN1/issues/57) #### v.1.4.1 -* improve exception messages and general error handling [#55](https://github.com/fgrosse/PHPASN1/pull/55) +* improve exception messages and general error handling [#55](https ://github.com/fgrosse/PHPASN1/pull/55) #### v.1.4.0 * **require PHP 5.6** diff --git a/vendor/fgrosse/phpasn1/README.md b/vendor/fgrosse/phpasn1/README.md index 3931010ab..6a1a18bf1 100644 --- a/vendor/fgrosse/phpasn1/README.md +++ b/vendor/fgrosse/phpasn1/README.md @@ -1,7 +1,7 @@ PHPASN1 ======= -[![Build Status](https://secure.travis-ci.org/fgrosse/PHPASN1.png?branch=master)](http://travis-ci.org/fgrosse/PHPASN1) +[![Build Status](https://github.com/fgrosse/PHPASN1/actions/workflows/phpunit.yml/badge.svg)](https://github.com/fgrosse/PHPASN1/actions/workflows/phpunit.yml) [![PHP 7 ready](http://php7ready.timesplinter.ch/fgrosse/PHPASN1/badge.svg)](https://travis-ci.org/fgrosse/PHPASN1) [![Coverage Status](https://coveralls.io/repos/fgrosse/PHPASN1/badge.svg?branch=master&service=github)](https://coveralls.io/github/fgrosse/PHPASN1?branch=master) diff --git a/vendor/fgrosse/phpasn1/composer.json b/vendor/fgrosse/phpasn1/composer.json index 01ffadaed..00f7d070f 100644 --- a/vendor/fgrosse/phpasn1/composer.json +++ b/vendor/fgrosse/phpasn1/composer.json @@ -19,11 +19,11 @@ "keywords": [ "x690", "x.690", "x.509", "x509", "asn1", "asn.1", "ber", "der", "binary", "encoding", "decoding" ], "require": { - "php": ">=7.0.0" + "php": "~7.1.0 || ~7.2.0 || ~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0" }, "require-dev": { - "phpunit/phpunit": "~6.3", - "satooshi/php-coveralls": "~2.0" + "phpunit/phpunit": "^6.3 || ^7.0 || ^8.0", + "php-coveralls/php-coveralls": "~2.0" }, "suggest": { "ext-gmp": "GMP is the preferred extension for big integer calculations", diff --git a/vendor/fgrosse/phpasn1/lib/ASN1/Construct.php b/vendor/fgrosse/phpasn1/lib/ASN1/Construct.php index 58f961375..cedf422e5 100644 --- a/vendor/fgrosse/phpasn1/lib/ASN1/Construct.php +++ b/vendor/fgrosse/phpasn1/lib/ASN1/Construct.php @@ -36,41 +36,49 @@ abstract class Construct extends ASNObject implements Countable, ArrayAccess, It return $this->children; } + #[\ReturnTypeWillChange] public function rewind() { $this->iteratorPosition = 0; } + #[\ReturnTypeWillChange] public function current() { return $this->children[$this->iteratorPosition]; } + #[\ReturnTypeWillChange] public function key() { return $this->iteratorPosition; } + #[\ReturnTypeWillChange] public function next() { $this->iteratorPosition++; } + #[\ReturnTypeWillChange] public function valid() { return isset($this->children[$this->iteratorPosition]); } + #[\ReturnTypeWillChange] public function offsetExists($offset) { return array_key_exists($offset, $this->children); } + #[\ReturnTypeWillChange] public function offsetGet($offset) { return $this->children[$offset]; } + #[\ReturnTypeWillChange] public function offsetSet($offset, $value) { if ($offset === null) { @@ -80,6 +88,7 @@ abstract class Construct extends ASNObject implements Countable, ArrayAccess, It $this->children[$offset] = $value; } + #[\ReturnTypeWillChange] public function offsetUnset($offset) { unset($this->children[$offset]); @@ -154,6 +163,7 @@ abstract class Construct extends ASNObject implements Countable, ArrayAccess, It * * @return Construct|static */ + #[\ReturnTypeWillChange] public static function fromBinary(&$binaryData, &$offsetIndex = 0) { $parsedObject = new static(); @@ -179,6 +189,7 @@ abstract class Construct extends ASNObject implements Countable, ArrayAccess, It return $parsedObject; } + #[\ReturnTypeWillChange] public function count($mode = COUNT_NORMAL) { return count($this->children, $mode); @@ -188,4 +199,4 @@ abstract class Construct extends ASNObject implements Countable, ArrayAccess, It { return new ArrayIterator($this->children); } -} +} \ No newline at end of file diff --git a/vendor/phpmailer/phpmailer/VERSION b/vendor/phpmailer/phpmailer/VERSION index 73092f345..c19261717 100644 --- a/vendor/phpmailer/phpmailer/VERSION +++ b/vendor/phpmailer/phpmailer/VERSION @@ -1 +1 @@ -6.5.3 \ No newline at end of file +6.5.4 \ No newline at end of file diff --git a/vendor/phpmailer/phpmailer/composer.json b/vendor/phpmailer/phpmailer/composer.json index 28557f59d..b13732bed 100644 --- a/vendor/phpmailer/phpmailer/composer.json +++ b/vendor/phpmailer/phpmailer/composer.json @@ -25,6 +25,11 @@ "type": "github" } ], + "config": { + "allow-plugins": { + "dealerdirect/phpcodesniffer-composer-installer": true + } + }, "require": { "php": ">=5.5.0", "ext-ctype": "*", @@ -35,10 +40,10 @@ "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0", "doctrine/annotations": "^1.2", "php-parallel-lint/php-console-highlighter": "^0.5.0", - "php-parallel-lint/php-parallel-lint": "^1.3", + "php-parallel-lint/php-parallel-lint": "^1.3.1", "phpcompatibility/php-compatibility": "^9.3.5", "roave/security-advisories": "dev-latest", - "squizlabs/php_codesniffer": "^3.6.0", + "squizlabs/php_codesniffer": "^3.6.2", "yoast/phpunit-polyfills": "^1.0.0" }, "suggest": { diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-fr.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-fr.php index 979e44b51..38a7a8e7e 100644 --- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-fr.php +++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-fr.php @@ -10,7 +10,7 @@ */ $PHPMAILER_LANG['authenticate'] = 'Erreur SMTP : échec de l’authentification.'; -$PHPMAILER_LANG['buggy_php'] = 'Votre version de PHP est affectée par un bogue qui peut entraîner des messages corrompus. Pour résoudre ce problème, passez à l’envoi par SMTP, désactivez l’option mail.add_x_header dans le fichier php.ini, passez à MacOS ou Linux, ou passez PHP à la version 7.0.17+ ou 7.1.3+.'; +$PHPMAILER_LANG['buggy_php'] = 'Votre version de PHP est affectée par un bug qui peut entraîner des messages corrompus. Pour résoudre ce problème, passez à l’envoi par SMTP, désactivez l’option mail.add_x_header dans le fichier php.ini, passez à MacOS ou Linux, ou passez PHP à la version 7.0.17+ ou 7.1.3+.'; $PHPMAILER_LANG['connect_host'] = 'Erreur SMTP : impossible de se connecter au serveur SMTP.'; $PHPMAILER_LANG['data_not_accepted'] = 'Erreur SMTP : données incorrectes.'; $PHPMAILER_LANG['empty_message'] = 'Corps du message vide.'; diff --git a/vendor/phpmailer/phpmailer/src/PHPMailer.php b/vendor/phpmailer/phpmailer/src/PHPMailer.php index 20972c4a4..19110df24 100644 --- a/vendor/phpmailer/phpmailer/src/PHPMailer.php +++ b/vendor/phpmailer/phpmailer/src/PHPMailer.php @@ -750,7 +750,7 @@ class PHPMailer * * @var string */ - const VERSION = '6.5.3'; + const VERSION = '6.5.4'; /** * Error severity: message only, continue processing. @@ -1185,6 +1185,7 @@ class PHPMailer * * @param string $addrstr The address list string * @param bool $useimap Whether to use the IMAP extension to parse the list + * @param string $charset The charset to use when decoding the address list string. * * @return array */ @@ -1742,7 +1743,7 @@ class PHPMailer fwrite($mail, $header); fwrite($mail, $body); $result = pclose($mail); - $addrinfo = static::parseAddresses($toAddr, true, $this->charSet); + $addrinfo = static::parseAddresses($toAddr, true, $this->CharSet); $this->doCallback( ($result === 0), [[$addrinfo['address'], $addrinfo['name']]], @@ -1797,7 +1798,13 @@ class PHPMailer */ protected static function isShellSafe($string) { - //Future-proof + //It's not possible to use shell commands safely (which includes the mail() function) without escapeshellarg, + //but some hosting providers disable it, creating a security problem that we don't want to have to deal with, + //so we don't. + if (!function_exists('escapeshellarg') || !function_exists('escapeshellcmd')) { + return false; + } + if ( escapeshellcmd($string) !== $string || !in_array(escapeshellarg($string), ["'$string'", "\"$string\""]) @@ -1905,7 +1912,7 @@ class PHPMailer if ($this->SingleTo && count($toArr) > 1) { foreach ($toArr as $toAddr) { $result = $this->mailPassthru($toAddr, $this->Subject, $body, $header, $params); - $addrinfo = static::parseAddresses($toAddr, true, $this->charSet); + $addrinfo = static::parseAddresses($toAddr, true, $this->CharSet); $this->doCallback( $result, [[$addrinfo['address'], $addrinfo['name']]], @@ -2630,16 +2637,15 @@ class PHPMailer $result .= $this->headerLine('X-Priority', $this->Priority); } if ('' === $this->XMailer) { + //Empty string for default X-Mailer header $result .= $this->headerLine( 'X-Mailer', 'PHPMailer ' . self::VERSION . ' (https://github.com/PHPMailer/PHPMailer)' ); - } else { - $myXmailer = trim($this->XMailer); - if ($myXmailer) { - $result .= $this->headerLine('X-Mailer', $myXmailer); - } - } + } elseif (is_string($this->XMailer) && trim($this->XMailer) !== '') { + //Some string + $result .= $this->headerLine('X-Mailer', trim($this->XMailer)); + } //Other values result in no X-Mailer header if ('' !== $this->ConfirmReadingTo) { $result .= $this->headerLine('Disposition-Notification-To', '<' . $this->ConfirmReadingTo . '>'); diff --git a/vendor/phpmailer/phpmailer/src/POP3.php b/vendor/phpmailer/phpmailer/src/POP3.php index ea5f9418c..6ca3e3cca 100644 --- a/vendor/phpmailer/phpmailer/src/POP3.php +++ b/vendor/phpmailer/phpmailer/src/POP3.php @@ -46,7 +46,7 @@ class POP3 * * @var string */ - const VERSION = '6.5.3'; + const VERSION = '6.5.4'; /** * Default POP3 port number. diff --git a/vendor/phpmailer/phpmailer/src/SMTP.php b/vendor/phpmailer/phpmailer/src/SMTP.php index 676dba292..138177060 100644 --- a/vendor/phpmailer/phpmailer/src/SMTP.php +++ b/vendor/phpmailer/phpmailer/src/SMTP.php @@ -35,7 +35,7 @@ class SMTP * * @var string */ - const VERSION = '6.5.3'; + const VERSION = '6.5.4'; /** * SMTP line break constant. @@ -187,6 +187,7 @@ class SMTP 'SendGrid' => '/[\d]{3} Ok: queued as (.*)/', 'CampaignMonitor' => '/[\d]{3} 2.0.0 OK:([a-zA-Z\d]{48})/', 'Haraka' => '/[\d]{3} Message Queued \((.*)\)/', + 'Mailjet' => '/[\d]{3} OK queued as (.*)/', ]; /** diff --git a/vendor/stripe/stripe-php/CHANGELOG.md b/vendor/stripe/stripe-php/CHANGELOG.md index 98ec3f01c..82a6d696e 100644 --- a/vendor/stripe/stripe-php/CHANGELOG.md +++ b/vendor/stripe/stripe-php/CHANGELOG.md @@ -1,7 +1,57 @@ # Changelog +## 7.114.0 - 2022-02-15 +* [#1243](https://github.com/stripe/stripe-php/pull/1243) Add test +* [#1240](https://github.com/stripe/stripe-php/pull/1240) API Updates + * Add support for `verify_microdeposits` method on resources `PaymentIntent` and `SetupIntent` + + +* [#1241](https://github.com/stripe/stripe-php/pull/1241) Add generic parameter to \Stripe\Collection usages + +## 7.113.0 - 2022-02-03 +* [#1239](https://github.com/stripe/stripe-php/pull/1239) API Updates + * Add `REASON_EXPIRED_UNCAPTURED_CHARGE` enum value on `Refund`. + +## 7.112.0 - 2022-01-25 +* [#1235](https://github.com/stripe/stripe-php/pull/1235) API Updates + * Add support for `phone_number_collection` on `PaymentLink` + * Add support for new value `is_vat` on enum `TaxId.type` + + +## 7.111.0 - 2022-01-20 +* [#1233](https://github.com/stripe/stripe-php/pull/1233) API Updates + * Add support for new resource `PaymentLink` + * Add support for `payment_link` on `Checkout.Session` + +## 7.110.0 - 2022-01-13 +* [#1232](https://github.com/stripe/stripe-php/pull/1232) API Updates + * Add support for `paid_out_of_band` on `Invoice` + +## 7.109.0 - 2022-01-12 +* [#1231](https://github.com/stripe/stripe-php/pull/1231) API Updates + * Add support for `customer_creation` on `Checkout.Session` +* [#1227](https://github.com/stripe/stripe-php/pull/1227) Update docs URLs + +## 7.108.0 - 2021-12-22 +* [#1226](https://github.com/stripe/stripe-php/pull/1226) Upgrade php-cs-fixer to 3.4.0. +* [#1222](https://github.com/stripe/stripe-php/pull/1222) API Updates + * Add support for `processing` on `PaymentIntent` +* [#1220](https://github.com/stripe/stripe-php/pull/1220) API Updates + +## 7.107.0 - 2021-12-09 +* [#1219](https://github.com/stripe/stripe-php/pull/1219) API Updates + * Add support for `metadata` on `BillingPortal.Configuration` + * Add support for `wallets` on `Issuing.Card` + +## 7.106.0 - 2021-12-09 +* [#1218](https://github.com/stripe/stripe-php/pull/1218) API Updates + * Add support for new values `ge_vat` and `ua_vat` on enum `TaxId.type` +* [#1216](https://github.com/stripe/stripe-php/pull/1216) Fix namespaced classes in @return PHPDoc. +* [#1214](https://github.com/stripe/stripe-php/pull/1214) Announce PHP8 support in CHANGELOG.md + ## 7.105.0 - 2021-12-06 -* [#1213](https://github.com/stripe/stripe-php/pull/1213) PHP 8.1, missing ReturnTypeWillChange annotations +* [#1213](https://github.com/stripe/stripe-php/pull/1213) PHP 8.1 missing ReturnTypeWillChange annotations. +* As of this version, PHP 8.1 is officially supported. ## 7.104.0 - 2021-12-01 * [#1211](https://github.com/stripe/stripe-php/pull/1211) PHPStan compatibility with PHP8.x diff --git a/vendor/stripe/stripe-php/README.md b/vendor/stripe/stripe-php/README.md index 1d2fe4434..e9d25ad9f 100644 --- a/vendor/stripe/stripe-php/README.md +++ b/vendor/stripe/stripe-php/README.md @@ -67,7 +67,7 @@ You can continue to use the legacy integration patterns used prior to version [7 ## Documentation -See the [PHP API docs](https://stripe.com/docs/api/php#intro). +See the [PHP API docs](https://stripe.com/docs/api/?lang=php#intro). See [video demonstrations][youtube-playlist] covering how to use the library. @@ -85,7 +85,7 @@ Otherwise, you can download v5.9.2 ([zip](https://github.com/stripe/stripe-php/a ## Custom Request Timeouts -_NOTE:_ We do not recommend decreasing the timeout for non-read-only calls (e.g. charge creation), since even if you locally timeout, the request on Stripe's side can still complete. If you are decreasing timeouts on these calls, make sure to use [idempotency tokens](https://stripe.com/docs/api/php#idempotent_requests) to avoid executing the same transaction twice as a result of timeout retry logic. +_NOTE:_ We do not recommend decreasing the timeout for non-read-only calls (e.g. charge creation), since even if you locally timeout, the request on Stripe's side can still complete. If you are decreasing timeouts on these calls, make sure to use [idempotency tokens](https://stripe.com/docs/api/?lang=php#idempotent_requests) to avoid executing the same transaction twice as a result of timeout retry logic. To modify request timeouts (connect or total, in seconds) you'll need to tell the API client to use a CurlClient other than its default. You'll set the timeouts in that CurlClient. @@ -263,7 +263,7 @@ See the "SSL / TLS compatibility issues" paragraph above for full context. If yo [composer]: https://getcomposer.org/ [connect]: https://stripe.com/connect [curl]: http://curl.haxx.se/docs/caextract.html -[idempotency-keys]: https://stripe.com/docs/api/php#idempotent_requests +[idempotency-keys]: https://stripe.com/docs/api/?lang=php#idempotent_requests [php-cs-fixer]: https://github.com/FriendsOfPHP/PHP-CS-Fixer [psr3]: http://www.php-fig.org/psr/psr-3/ [stripe-mock]: https://github.com/stripe/stripe-mock diff --git a/vendor/stripe/stripe-php/VERSION b/vendor/stripe/stripe-php/VERSION index aa91ae022..1fc959a1e 100644 --- a/vendor/stripe/stripe-php/VERSION +++ b/vendor/stripe/stripe-php/VERSION @@ -1 +1 @@ -7.105.0 +7.114.0 diff --git a/vendor/stripe/stripe-php/composer.json b/vendor/stripe/stripe-php/composer.json index d8d4551dc..dd585a4c8 100644 --- a/vendor/stripe/stripe-php/composer.json +++ b/vendor/stripe/stripe-php/composer.json @@ -23,7 +23,7 @@ "require-dev": { "phpunit/phpunit": "^5.7 || ^9.0", "squizlabs/php_codesniffer": "^3.3", - "friendsofphp/php-cs-fixer": "3.2.1", + "friendsofphp/php-cs-fixer": "3.5.0", "phpstan/phpstan": "^1.2" }, "autoload": { diff --git a/vendor/stripe/stripe-php/init.php b/vendor/stripe/stripe-php/init.php index 7dda8f163..d4606acfb 100644 --- a/vendor/stripe/stripe-php/init.php +++ b/vendor/stripe/stripe-php/init.php @@ -124,6 +124,7 @@ require __DIR__ . '/lib/Order.php'; require __DIR__ . '/lib/OrderItem.php'; require __DIR__ . '/lib/OrderReturn.php'; require __DIR__ . '/lib/PaymentIntent.php'; +require __DIR__ . '/lib/PaymentLink.php'; require __DIR__ . '/lib/PaymentMethod.php'; require __DIR__ . '/lib/Payout.php'; require __DIR__ . '/lib/Person.php'; @@ -200,6 +201,7 @@ require __DIR__ . '/lib/Service/MandateService.php'; require __DIR__ . '/lib/Service/OrderService.php'; require __DIR__ . '/lib/Service/OrderReturnService.php'; require __DIR__ . '/lib/Service/PaymentIntentService.php'; +require __DIR__ . '/lib/Service/PaymentLinkService.php'; require __DIR__ . '/lib/Service/PaymentMethodService.php'; require __DIR__ . '/lib/Service/PayoutService.php'; require __DIR__ . '/lib/Service/PlanService.php'; @@ -234,9 +236,9 @@ require __DIR__ . '/lib/Service/TransferService.php'; require __DIR__ . '/lib/Service/WebhookEndpointService.php'; // Service factories -require __DIR__ . '/lib/Service/CoreServiceFactory.php'; require __DIR__ . '/lib/Service/BillingPortal/BillingPortalServiceFactory.php'; require __DIR__ . '/lib/Service/Checkout/CheckoutServiceFactory.php'; +require __DIR__ . '/lib/Service/CoreServiceFactory.php'; require __DIR__ . '/lib/Service/Identity/IdentityServiceFactory.php'; require __DIR__ . '/lib/Service/Issuing/IssuingServiceFactory.php'; require __DIR__ . '/lib/Service/Radar/RadarServiceFactory.php'; diff --git a/vendor/stripe/stripe-php/lib/Account.php b/vendor/stripe/stripe-php/lib/Account.php index 9be2b82ca..e5d846b0f 100644 --- a/vendor/stripe/stripe-php/lib/Account.php +++ b/vendor/stripe/stripe-php/lib/Account.php @@ -26,7 +26,7 @@ namespace Stripe; * @property string $default_currency Three-letter ISO currency code representing the default currency for the account. This must be a currency that Stripe supports in the account's country. * @property bool $details_submitted Whether account details have been submitted. Standard accounts cannot receive payouts before this is true. * @property null|string $email An email address associated with the account. You can treat this as metadata: it is not used for authentication or messaging account holders. - * @property \Stripe\Collection $external_accounts External accounts (bank accounts and debit cards) currently attached to this account + * @property \Stripe\Collection<\Stripe\BankAccount|\Stripe\Card> $external_accounts External accounts (bank accounts and debit cards) currently attached to this account * @property \Stripe\StripeObject $future_requirements * @property \Stripe\Person $individual

This is an object representing a person associated with a Stripe account.

A platform cannot access a Standard or Express account's persons after the account starts onboarding, such as after generating an account link for the account. See the Standard onboarding or Express onboarding documentation for information about platform pre-filling and account onboarding steps.

Related guide: Handling Identity Verification with the API.

* @property \Stripe\StripeObject $metadata Set of key-value pairs that you can attach to an object. This can be useful for storing additional information about the object in a structured format. @@ -184,7 +184,7 @@ class Account extends ApiResource * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection the list of persons + * @return \Stripe\Collection<\Stripe\Person> the list of persons */ public function persons($params = null, $opts = null) { @@ -228,7 +228,7 @@ class Account extends ApiResource * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection the list of capabilities + * @return \Stripe\Collection<\Stripe\Capability> the list of capabilities */ public static function allCapabilities($id, $params = null, $opts = null) { @@ -273,7 +273,7 @@ class Account extends ApiResource * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection the list of external accounts (BankAccount or Card) + * @return \Stripe\Collection<\Stripe\BankAccount|\Stripe\Card> the list of external accounts (BankAccount or Card) */ public static function allExternalAccounts($id, $params = null, $opts = null) { @@ -362,7 +362,7 @@ class Account extends ApiResource * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection the list of persons + * @return \Stripe\Collection<\Stripe\Person> the list of persons */ public static function allPersons($id, $params = null, $opts = null) { diff --git a/vendor/stripe/stripe-php/lib/ApplicationFee.php b/vendor/stripe/stripe-php/lib/ApplicationFee.php index 88aeed645..2a53204a8 100644 --- a/vendor/stripe/stripe-php/lib/ApplicationFee.php +++ b/vendor/stripe/stripe-php/lib/ApplicationFee.php @@ -18,7 +18,7 @@ namespace Stripe; * @property bool $livemode Has the value true if the object exists in live mode or the value false if the object exists in test mode. * @property null|string|\Stripe\Charge $originating_transaction ID of the corresponding charge on the platform account, if this fee was the result of a charge using the destination parameter. * @property bool $refunded Whether the fee has been fully refunded. If the fee is only partially refunded, this attribute will still be false. - * @property \Stripe\Collection $refunds A list of refunds that have been applied to the fee. + * @property \Stripe\Collection<\Stripe\StripeObject> $refunds A list of refunds that have been applied to the fee. */ class ApplicationFee extends ApiResource { @@ -37,7 +37,7 @@ class ApplicationFee extends ApiResource * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection the list of fee refunds + * @return \Stripe\Collection<\Stripe\ApplicationFeeRefund> the list of fee refunds */ public static function allRefunds($id, $params = null, $opts = null) { diff --git a/vendor/stripe/stripe-php/lib/BillingPortal/Configuration.php b/vendor/stripe/stripe-php/lib/BillingPortal/Configuration.php index 7ad1a0398..cb6007796 100644 --- a/vendor/stripe/stripe-php/lib/BillingPortal/Configuration.php +++ b/vendor/stripe/stripe-php/lib/BillingPortal/Configuration.php @@ -18,6 +18,7 @@ namespace Stripe\BillingPortal; * @property \Stripe\StripeObject $features * @property bool $is_default Whether the configuration is the default. If true, this configuration can be managed in the Dashboard and portal sessions will use this configuration unless it is overriden when creating the session. * @property bool $livemode Has the value true if the object exists in live mode or the value false if the object exists in test mode. + * @property null|\Stripe\StripeObject $metadata Set of key-value pairs that you can attach to an object. This can be useful for storing additional information about the object in a structured format. * @property int $updated Time at which the object was last updated. Measured in seconds since the Unix epoch. */ class Configuration extends \Stripe\ApiResource diff --git a/vendor/stripe/stripe-php/lib/BitcoinReceiver.php b/vendor/stripe/stripe-php/lib/BitcoinReceiver.php index 208610a0f..1a0353b40 100644 --- a/vendor/stripe/stripe-php/lib/BitcoinReceiver.php +++ b/vendor/stripe/stripe-php/lib/BitcoinReceiver.php @@ -27,7 +27,7 @@ namespace Stripe; * @property null|\Stripe\StripeObject $metadata Set of key-value pairs that you can attach to an object. This can be useful for storing additional information about the object in a structured format. * @property null|string $payment The ID of the payment created from the receiver, if any. Hidden when viewing the receiver with a publishable key. * @property null|string $refund_address The refund address of this bitcoin receiver. - * @property \Stripe\Collection $transactions A list with one entry for each time that the customer sent bitcoin to the receiver. Hidden when viewing the receiver with a publishable key. + * @property \Stripe\Collection<\Stripe\BitcoinTransaction> $transactions A list with one entry for each time that the customer sent bitcoin to the receiver. Hidden when viewing the receiver with a publishable key. * @property bool $uncaptured_funds This receiver contains uncaptured funds that can be used for a payment or refunded. * @property null|bool $used_for_payment Indicate if this source is used for payment. */ diff --git a/vendor/stripe/stripe-php/lib/Charge.php b/vendor/stripe/stripe-php/lib/Charge.php index b9fc301c7..0737d20ad 100644 --- a/vendor/stripe/stripe-php/lib/Charge.php +++ b/vendor/stripe/stripe-php/lib/Charge.php @@ -49,7 +49,7 @@ namespace Stripe; * @property null|string $receipt_number This is the transaction number that appears on email receipts sent for this charge. This attribute will be null until a receipt has been sent. * @property null|string $receipt_url This is the URL to view the receipt for this charge. The receipt is kept up-to-date to the latest state of the charge, including any refunds. If the charge is for an Invoice, the receipt will be stylized as an Invoice receipt. * @property bool $refunded Whether the charge has been fully refunded. If the charge is only partially refunded, this attribute will still be false. - * @property \Stripe\Collection $refunds A list of refunds that have been applied to the charge. + * @property \Stripe\Collection<\Stripe\Refund> $refunds A list of refunds that have been applied to the charge. * @property null|string|\Stripe\Review $review ID of the review associated with this charge if one exists. * @property null|\Stripe\StripeObject $shipping Shipping information for the charge. * @property null|\Stripe\Account|\Stripe\AlipayAccount|\Stripe\BankAccount|\Stripe\BitcoinReceiver|\Stripe\Card|\Stripe\Source $source This is a legacy field that will be removed in the future. It contains the Source, Card, or BankAccount object used for the charge. For details about the payment method used for this charge, refer to payment_method or payment_method_details instead. diff --git a/vendor/stripe/stripe-php/lib/Checkout/Session.php b/vendor/stripe/stripe-php/lib/Checkout/Session.php index 9601dd8d4..c3fbaae37 100644 --- a/vendor/stripe/stripe-php/lib/Checkout/Session.php +++ b/vendor/stripe/stripe-php/lib/Checkout/Session.php @@ -37,15 +37,17 @@ namespace Stripe\Checkout; * @property null|\Stripe\StripeObject $consent_collection When set, provides configuration for the Checkout Session to gather active consent from customers. * @property null|string $currency Three-letter ISO currency code, in lowercase. Must be a supported currency. * @property null|string|\Stripe\Customer $customer The ID of the customer for this Session. For Checkout Sessions in payment or subscription mode, Checkout will create a new customer object based on information provided during the payment flow unless an existing customer was provided when the Session was created. + * @property null|string $customer_creation Configure whether a Checkout Session creates a Customer when the Checkout Session completes. * @property null|\Stripe\StripeObject $customer_details The customer details including the customer's tax exempt status and the customer's tax IDs. Only present on Sessions in payment or subscription mode. * @property null|string $customer_email If provided, this value will be used when the Customer object is created. If not provided, customers will be asked to enter their email address. Use this parameter to prefill customer data if you already have an email on file. To access information about the customer once the payment flow is complete, use the customer attribute. * @property int $expires_at The timestamp at which the Checkout Session will expire. - * @property \Stripe\Collection $line_items The line items purchased by the customer. + * @property \Stripe\Collection<\Stripe\LineItem> $line_items The line items purchased by the customer. * @property bool $livemode Has the value true if the object exists in live mode or the value false if the object exists in test mode. * @property null|string $locale The IETF language tag of the locale Checkout is displayed in. If blank or auto, the browser's locale is used. * @property null|\Stripe\StripeObject $metadata Set of key-value pairs that you can attach to an object. This can be useful for storing additional information about the object in a structured format. * @property string $mode The mode of the Checkout Session. * @property null|string|\Stripe\PaymentIntent $payment_intent The ID of the PaymentIntent for Checkout Sessions in payment mode. + * @property null|string|\Stripe\PaymentLink $payment_link The ID of the Payment Link that created this Session. * @property null|\Stripe\StripeObject $payment_method_options Payment-method-specific configuration for the PaymentIntent or SetupIntent of this CheckoutSession. * @property string[] $payment_method_types A list of the types of payment methods (e.g. card) this Checkout Session is allowed to accept. * @property string $payment_status The payment status of the Checkout Session, one of paid, unpaid, or no_payment_required. You can use this value to decide when to fulfill your customer's order. @@ -76,6 +78,9 @@ class Session extends \Stripe\ApiResource const BILLING_ADDRESS_COLLECTION_AUTO = 'auto'; const BILLING_ADDRESS_COLLECTION_REQUIRED = 'required'; + const CUSTOMER_CREATION_ALWAYS = 'always'; + const CUSTOMER_CREATION_IF_REQUIRED = 'if_required'; + const MODE_PAYMENT = 'payment'; const MODE_SETUP = 'setup'; const MODE_SUBSCRIPTION = 'subscription'; @@ -99,7 +104,7 @@ class Session extends \Stripe\ApiResource * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Session the expired session + * @return \Stripe\Checkout\Session the expired session */ public function expire($params = null, $opts = null) { @@ -119,7 +124,7 @@ class Session extends \Stripe\ApiResource * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection the list of items + * @return \Stripe\Collection<\Stripe\LineItem> the list of items */ public static function allLineItems($id, $params = null, $opts = null) { diff --git a/vendor/stripe/stripe-php/lib/Collection.php b/vendor/stripe/stripe-php/lib/Collection.php index 294ea9ddf..4de2f9d73 100644 --- a/vendor/stripe/stripe-php/lib/Collection.php +++ b/vendor/stripe/stripe-php/lib/Collection.php @@ -5,10 +5,13 @@ namespace Stripe; /** * Class Collection. * + * @template TStripeObject of StripeObject + * @template-implements \IteratorAggregate + * * @property string $object * @property string $url * @property bool $has_more - * @property \Stripe\StripeObject[] $data + * @property TStripeObject[] $data */ class Collection extends StripeObject implements \Countable, \IteratorAggregate { @@ -61,6 +64,14 @@ class Collection extends StripeObject implements \Countable, \IteratorAggregate throw new Exception\InvalidArgumentException($msg); } + /** + * @param null|array $params + * @param null|array|string $opts + * + * @throws Exception\ApiErrorException + * + * @return Collection + */ public function all($params = null, $opts = null) { self::_validateParams($params); @@ -78,6 +89,14 @@ class Collection extends StripeObject implements \Countable, \IteratorAggregate return $obj; } + /** + * @param null|array $params + * @param null|array|string $opts + * + * @throws Exception\ApiErrorException + * + * @return TStripeObject + */ public function create($params = null, $opts = null) { self::_validateParams($params); @@ -88,6 +107,15 @@ class Collection extends StripeObject implements \Countable, \IteratorAggregate return Util\Util::convertToStripeObject($response, $opts); } + /** + * @param string $id + * @param null|array $params + * @param null|array|string $opts + * + * @throws Exception\ApiErrorException + * + * @return TStripeObject + */ public function retrieve($id, $params = null, $opts = null) { self::_validateParams($params); @@ -134,7 +162,7 @@ class Collection extends StripeObject implements \Countable, \IteratorAggregate } /** - * @return \Generator|StripeObject[] A generator that can be used to + * @return \Generator|TStripeObject[] A generator that can be used to * iterate across all objects across all pages. As page boundaries are * encountered, the next page will be fetched automatically for * continued iteration. @@ -197,7 +225,7 @@ class Collection extends StripeObject implements \Countable, \IteratorAggregate * @param null|array $params * @param null|array|string $opts * - * @return Collection + * @return Collection */ public function nextPage($params = null, $opts = null) { @@ -225,7 +253,7 @@ class Collection extends StripeObject implements \Countable, \IteratorAggregate * @param null|array $params * @param null|array|string $opts * - * @return Collection + * @return Collection */ public function previousPage($params = null, $opts = null) { @@ -247,7 +275,7 @@ class Collection extends StripeObject implements \Countable, \IteratorAggregate /** * Gets the first item from the current page. Returns `null` if the current page is empty. * - * @return null|\Stripe\StripeObject + * @return null|TStripeObject */ public function first() { @@ -257,7 +285,7 @@ class Collection extends StripeObject implements \Countable, \IteratorAggregate /** * Gets the last item from the current page. Returns `null` if the current page is empty. * - * @return null|\Stripe\StripeObject + * @return null|TStripeObject */ public function last() { diff --git a/vendor/stripe/stripe-php/lib/Coupon.php b/vendor/stripe/stripe-php/lib/Coupon.php index 41afdcfc9..0d84bd4bf 100644 --- a/vendor/stripe/stripe-php/lib/Coupon.php +++ b/vendor/stripe/stripe-php/lib/Coupon.php @@ -8,8 +8,8 @@ namespace Stripe; * A coupon contains information about a percent-off or amount-off discount you * might want to apply to a customer. Coupons may be applied to invoices or orders. Coupons do - * not work with conventional one-off orders. + * Coupons do not work with conventional one-off charges. * * @property string $id Unique identifier for the object. diff --git a/vendor/stripe/stripe-php/lib/CreditNote.php b/vendor/stripe/stripe-php/lib/CreditNote.php index 591c5d746..4ee660aa1 100644 --- a/vendor/stripe/stripe-php/lib/CreditNote.php +++ b/vendor/stripe/stripe-php/lib/CreditNote.php @@ -21,7 +21,7 @@ namespace Stripe; * @property int $discount_amount The integer amount in %s representing the total amount of discount that was credited. * @property \Stripe\StripeObject[] $discount_amounts The aggregate amounts calculated per discount for all line items. * @property string|\Stripe\Invoice $invoice ID of the invoice. - * @property \Stripe\Collection $lines Line items that make up the credit note + * @property \Stripe\Collection<\Stripe\CreditNoteLineItem> $lines Line items that make up the credit note * @property bool $livemode Has the value true if the object exists in live mode or the value false if the object exists in test mode. * @property null|string $memo Customer-facing text that appears on the credit note PDF. * @property null|\Stripe\StripeObject $metadata Set of key-value pairs that you can attach to an object. This can be useful for storing additional information about the object in a structured format. @@ -102,7 +102,7 @@ class CreditNote extends ApiResource * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection the list of credit note line items + * @return \Stripe\Collection<\Stripe\CreditNoteLineItem> the list of credit note line items */ public static function allLines($id, $params = null, $opts = null) { diff --git a/vendor/stripe/stripe-php/lib/Customer.php b/vendor/stripe/stripe-php/lib/Customer.php index c1b6ad72e..6887e4479 100644 --- a/vendor/stripe/stripe-php/lib/Customer.php +++ b/vendor/stripe/stripe-php/lib/Customer.php @@ -5,10 +5,8 @@ namespace Stripe; /** - * Customer objects allow you to perform recurring charges, and to - * track multiple charges, that are associated with the same customer. The API - * allows you to create, delete, and update your customers. You can retrieve - * individual customers as well as a list of all your customers. + * This object represents a customer of your business. It lets you create recurring + * charges and track payments that belong to the same customer. * * Related guide: Save a card during @@ -34,11 +32,11 @@ namespace Stripe; * @property null|string $phone The customer's phone number. * @property null|string[] $preferred_locales The customer's preferred locales (languages), ordered by preference. * @property null|\Stripe\StripeObject $shipping Mailing and shipping address for the customer. Appears on invoices emailed to this customer. - * @property \Stripe\Collection $sources The customer's payment sources, if any. - * @property \Stripe\Collection $subscriptions The customer's current subscriptions, if any. + * @property \Stripe\Collection<\Stripe\Account|\Stripe\AlipayAccount|\Stripe\BankAccount|\Stripe\BitcoinReceiver|\Stripe\Card|\Stripe\Source> $sources The customer's payment sources, if any. + * @property \Stripe\Collection<\Stripe\Subscription> $subscriptions The customer's current subscriptions, if any. * @property \Stripe\StripeObject $tax * @property null|string $tax_exempt Describes the customer's tax exemption status. One of none, exempt, or reverse. When set to reverse, invoice and receipt PDFs include the text "Reverse charge". - * @property \Stripe\Collection $tax_ids The customer's tax IDs. + * @property \Stripe\Collection<\Stripe\TaxId> $tax_ids The customer's tax IDs. */ class Customer extends ApiResource { @@ -89,7 +87,7 @@ class Customer extends ApiResource * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection list of PaymentMethods + * @return \Stripe\Collection<\Stripe\Customer> list of PaymentMethods */ public static function allPaymentMethods($id, $params = null, $opts = null) { @@ -110,7 +108,7 @@ class Customer extends ApiResource * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection the list of customer balance transactions + * @return \Stripe\Collection<\Stripe\CustomerBalanceTransaction> the list of customer balance transactions */ public static function allBalanceTransactions($id, $params = null, $opts = null) { @@ -169,7 +167,7 @@ class Customer extends ApiResource * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection the list of payment sources (AlipayAccount, BankAccount, BitcoinReceiver, Card or Source) + * @return \Stripe\Collection<\Stripe\AlipayAccount|\Stripe\BankAccount|\Stripe\BitcoinReceiver|\Stripe\Card|\Stripe\Source> the list of payment sources (AlipayAccount, BankAccount, BitcoinReceiver, Card or Source) */ public static function allSources($id, $params = null, $opts = null) { @@ -243,7 +241,7 @@ class Customer extends ApiResource * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection the list of tax ids + * @return \Stripe\Collection<\Stripe\TaxId> the list of tax ids */ public static function allTaxIds($id, $params = null, $opts = null) { diff --git a/vendor/stripe/stripe-php/lib/File.php b/vendor/stripe/stripe-php/lib/File.php index 9f605641e..04646d303 100644 --- a/vendor/stripe/stripe-php/lib/File.php +++ b/vendor/stripe/stripe-php/lib/File.php @@ -20,7 +20,7 @@ namespace Stripe; * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch. * @property null|int $expires_at The time at which the file expires and is no longer available in epoch seconds. * @property null|string $filename A filename for the file, suitable for saving to a filesystem. - * @property null|\Stripe\Collection $links A list of file links that point at this file. + * @property null|\Stripe\Collection<\Stripe\FileLink> $links A list of file links that point at this file. * @property string $purpose The purpose of the uploaded file. * @property int $size The size in bytes of the file object. * @property null|string $title A user friendly title for the document. diff --git a/vendor/stripe/stripe-php/lib/Identity/VerificationSession.php b/vendor/stripe/stripe-php/lib/Identity/VerificationSession.php index a84766dfd..501939976 100644 --- a/vendor/stripe/stripe-php/lib/Identity/VerificationSession.php +++ b/vendor/stripe/stripe-php/lib/Identity/VerificationSession.php @@ -58,7 +58,7 @@ class VerificationSession extends \Stripe\ApiResource * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\VerificationSession the canceled verification session + * @return \Stripe\Identity\VerificationSession the canceled verification session */ public function cancel($params = null, $opts = null) { @@ -75,7 +75,7 @@ class VerificationSession extends \Stripe\ApiResource * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\VerificationSession the redacted verification session + * @return \Stripe\Identity\VerificationSession the redacted verification session */ public function redact($params = null, $opts = null) { diff --git a/vendor/stripe/stripe-php/lib/Invoice.php b/vendor/stripe/stripe-php/lib/Invoice.php index f632f2a5f..f5360a111 100644 --- a/vendor/stripe/stripe-php/lib/Invoice.php +++ b/vendor/stripe/stripe-php/lib/Invoice.php @@ -80,13 +80,14 @@ namespace Stripe; * @property null|string $hosted_invoice_url The URL for the hosted invoice page, which allows customers to view and pay an invoice. If the invoice has not been finalized yet, this will be null. * @property null|string $invoice_pdf The link to download the PDF for the invoice. If the invoice has not been finalized yet, this will be null. * @property null|\Stripe\ErrorObject $last_finalization_error The error encountered during the previous attempt to finalize the invoice. This field is cleared when the invoice is successfully finalized. - * @property \Stripe\Collection $lines The individual line items that make up the invoice. lines is sorted as follows: invoice items in reverse chronological order, followed by the subscription, if any. + * @property \Stripe\Collection<\Stripe\InvoiceLineItem> $lines The individual line items that make up the invoice. lines is sorted as follows: invoice items in reverse chronological order, followed by the subscription, if any. * @property bool $livemode Has the value true if the object exists in live mode or the value false if the object exists in test mode. * @property null|\Stripe\StripeObject $metadata Set of key-value pairs that you can attach to an object. This can be useful for storing additional information about the object in a structured format. * @property null|int $next_payment_attempt The time at which payment will next be attempted. This value will be null for invoices where collection_method=send_invoice. * @property null|string $number A unique, identifying string that appears on emails sent to the customer for this invoice. This starts with the customer's unique invoice_prefix if it is specified. * @property null|string|\Stripe\Account $on_behalf_of The account (if any) for which the funds of the invoice payment are intended. If set, the invoice will be presented with the branding and support information of the specified account. See the Invoices with Connect documentation for details. * @property bool $paid Whether payment was successfully collected for this invoice. An invoice can be paid (most commonly) with a charge or with credit from the customer's account balance. + * @property bool $paid_out_of_band Returns true if the invoice was manually marked paid, returns false if the invoice hasn't been paid yet or was paid on Stripe. * @property null|string|\Stripe\PaymentIntent $payment_intent The PaymentIntent associated with this invoice. The PaymentIntent is generated when the invoice is finalized, and can then be used to pay the invoice. Note that voiding an invoice will cancel the PaymentIntent. * @property \Stripe\StripeObject $payment_settings * @property int $period_end End of the usage period during which invoice items were added to this invoice. @@ -152,7 +153,7 @@ class Invoice extends ApiResource * * @throws StripeExceptionApiErrorException if the request fails * - * @return \Stripe\Collection the list of lines (InvoiceLineItem) + * @return \Stripe\Collection<\Stripe\InvoiceLineItem> the list of lines (InvoiceLineItem) */ public static function allLines($id, $params = null, $opts = null) { diff --git a/vendor/stripe/stripe-php/lib/Issuing/Authorization.php b/vendor/stripe/stripe-php/lib/Issuing/Authorization.php index f45410517..7e597df52 100644 --- a/vendor/stripe/stripe-php/lib/Issuing/Authorization.php +++ b/vendor/stripe/stripe-php/lib/Issuing/Authorization.php @@ -51,7 +51,7 @@ class Authorization extends \Stripe\ApiResource * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Authorization the approved authorization + * @return \Stripe\Issuing\Authorization the approved authorization */ public function approve($params = null, $opts = null) { @@ -68,7 +68,7 @@ class Authorization extends \Stripe\ApiResource * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Authorization the declined authorization + * @return \Stripe\Issuing\Authorization the declined authorization */ public function decline($params = null, $opts = null) { diff --git a/vendor/stripe/stripe-php/lib/Issuing/Card.php b/vendor/stripe/stripe-php/lib/Issuing/Card.php index e0ac774e7..31deaf3f0 100644 --- a/vendor/stripe/stripe-php/lib/Issuing/Card.php +++ b/vendor/stripe/stripe-php/lib/Issuing/Card.php @@ -29,6 +29,7 @@ namespace Stripe\Issuing; * @property \Stripe\StripeObject $spending_controls * @property string $status Whether authorizations can be approved on this card. * @property string $type The type of the card. + * @property null|\Stripe\StripeObject $wallets Information relating to digital wallets (like Apple Pay and Google Pay). */ class Card extends \Stripe\ApiResource { diff --git a/vendor/stripe/stripe-php/lib/Issuing/Dispute.php b/vendor/stripe/stripe-php/lib/Issuing/Dispute.php index 2a80c3b81..1eeb17eea 100644 --- a/vendor/stripe/stripe-php/lib/Issuing/Dispute.php +++ b/vendor/stripe/stripe-php/lib/Issuing/Dispute.php @@ -40,7 +40,7 @@ class Dispute extends \Stripe\ApiResource * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Dispute the submited dispute + * @return \Stripe\Issuing\Dispute the submited dispute */ public function submit($params = null, $opts = null) { diff --git a/vendor/stripe/stripe-php/lib/Order.php b/vendor/stripe/stripe-php/lib/Order.php index 52fa2c7de..fbbb90611 100644 --- a/vendor/stripe/stripe-php/lib/Order.php +++ b/vendor/stripe/stripe-php/lib/Order.php @@ -28,7 +28,7 @@ namespace Stripe; * @property \Stripe\OrderItem[] $items List of items constituting the order. An order can have up to 25 items. * @property bool $livemode Has the value true if the object exists in live mode or the value false if the object exists in test mode. * @property null|\Stripe\StripeObject $metadata Set of key-value pairs that you can attach to an object. This can be useful for storing additional information about the object in a structured format. - * @property null|\Stripe\Collection $returns A list of returns that have taken place for this order. + * @property null|\Stripe\Collection<\Stripe\OrderReturn> $returns A list of returns that have taken place for this order. * @property null|string $selected_shipping_method The shipping method that is currently selected for this order, if any. If present, it is equal to one of the ids of shipping methods in the shipping_methods array. At order creation time, if there are multiple shipping methods, Stripe will automatically selected the first method. * @property null|\Stripe\StripeObject $shipping The shipping address for the order. Present if the order is for goods to be shipped. * @property null|\Stripe\StripeObject[] $shipping_methods A list of supported shipping methods for this order. The desired shipping method can be specified either by updating the order, or when paying it. diff --git a/vendor/stripe/stripe-php/lib/PaymentIntent.php b/vendor/stripe/stripe-php/lib/PaymentIntent.php index 70d068ec0..ee6f4224a 100644 --- a/vendor/stripe/stripe-php/lib/PaymentIntent.php +++ b/vendor/stripe/stripe-php/lib/PaymentIntent.php @@ -29,7 +29,7 @@ namespace Stripe; * @property null|int $canceled_at Populated when status is canceled, this is the time at which the PaymentIntent was canceled. Measured in seconds since the Unix epoch. * @property null|string $cancellation_reason Reason for cancellation of this PaymentIntent, either user-provided (duplicate, fraudulent, requested_by_customer, or abandoned) or generated by Stripe internally (failed_invoice, void_invoice, or automatic). * @property string $capture_method Controls when the funds will be captured from the customer's account. - * @property \Stripe\Collection $charges Charges that were created by this PaymentIntent, if any. + * @property \Stripe\Collection<\Stripe\Charge> $charges Charges that were created by this PaymentIntent, if any. * @property null|string $client_secret

The client secret of this PaymentIntent. Used for client-side retrieval using a publishable key.

The client secret can be used to complete a payment from your frontend. It should not be stored, logged, embedded in URLs, or exposed to anyone other than the customer. Make sure that you have TLS enabled on any page that includes the client secret.

Refer to our docs to accept a payment and learn about how client_secret should be handled.

* @property string $confirmation_method * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch. @@ -45,6 +45,7 @@ namespace Stripe; * @property null|string|\Stripe\PaymentMethod $payment_method ID of the payment method used in this PaymentIntent. * @property null|\Stripe\StripeObject $payment_method_options Payment-method-specific configuration for this PaymentIntent. * @property string[] $payment_method_types The list of payment method types (e.g. card) that this PaymentIntent is allowed to use. + * @property null|\Stripe\StripeObject $processing If present, this property tells you about the processing state of the payment. * @property null|string $receipt_email Email address that the receipt for the resulting payment will be sent to. If receipt_email is specified for a payment in live mode, a receipt will be sent regardless of your email settings. * @property null|string|\Stripe\Review $review ID of the review associated with this PaymentIntent, if any. * @property null|string $setup_future_usage

Indicates that you intend to make future payments with this PaymentIntent's payment method.

Providing this parameter will attach the payment method to the PaymentIntent's Customer, if present, after the PaymentIntent is confirmed and any required actions from the user are complete. If no Customer was provided, the payment method can still be attached to a Customer after the transaction completes.

When processing card payments, Stripe also uses setup_future_usage to dynamically optimize your payment flow and comply with regional legislation and network rules, such as SCA.

@@ -123,4 +124,21 @@ class PaymentIntent extends ApiResource return $this; } + + /** + * @param null|array $params + * @param null|array|string $opts + * + * @throws \Stripe\Exception\ApiErrorException if the request fails + * + * @return \Stripe\PaymentIntent the verified payment intent + */ + public function verifyMicrodeposits($params = null, $opts = null) + { + $url = $this->instanceUrl() . '/verify_microdeposits'; + list($response, $opts) = $this->_request('post', $url, $params, $opts); + $this->refreshFrom($response, $opts); + + return $this; + } } diff --git a/vendor/stripe/stripe-php/lib/PaymentLink.php b/vendor/stripe/stripe-php/lib/PaymentLink.php new file mode 100644 index 000000000..8062c5374 --- /dev/null +++ b/vendor/stripe/stripe-php/lib/PaymentLink.php @@ -0,0 +1,70 @@ +checkout session to + * render the payment page. You can use checkout + * session events to track payments through payment links. + * + * Related guide: Payment Links API + * + * @property string $id Unique identifier for the object. + * @property string $object String representing the object's type. Objects of the same type share the same value. + * @property bool $active Whether the payment link's url is active. If false, customers visiting the URL will be shown a page saying that the link has been deactivated. + * @property \Stripe\StripeObject $after_completion + * @property bool $allow_promotion_codes Whether user redeemable promotion codes are enabled. + * @property null|int $application_fee_amount The amount of the application fee (if any) that will be requested to be applied to the payment and transferred to the application owner's Stripe account. + * @property null|float $application_fee_percent This represents the percentage of the subscription invoice subtotal that will be transferred to the application owner's Stripe account. + * @property \Stripe\StripeObject $automatic_tax + * @property string $billing_address_collection Configuration for collecting the customer's billing address. + * @property \Stripe\Collection<\Stripe\LineItem> $line_items The line items representing what is being sold. + * @property bool $livemode Has the value true if the object exists in live mode or the value false if the object exists in test mode. + * @property \Stripe\StripeObject $metadata Set of key-value pairs that you can attach to an object. This can be useful for storing additional information about the object in a structured format. + * @property null|string|\Stripe\Account $on_behalf_of The account on behalf of which to charge. See the Connect documentation for details. + * @property null|string[] $payment_method_types The list of payment method types that customers can use. When null, Stripe will dynamically show relevant payment methods you've enabled in your payment method settings. + * @property \Stripe\StripeObject $phone_number_collection + * @property null|\Stripe\StripeObject $shipping_address_collection Configuration for collecting the customer's shipping address. + * @property null|\Stripe\StripeObject $subscription_data When creating a subscription, the specified configuration data will be used. There must be at least one line item with a recurring price to use subscription_data. + * @property null|\Stripe\StripeObject $transfer_data The account (if any) the payments will be attributed to for tax reporting, and where funds from each payment will be transferred to. + * @property string $url The public URL that can be shared with customers. + */ +class PaymentLink extends ApiResource +{ + const OBJECT_NAME = 'payment_link'; + + use ApiOperations\All; + use ApiOperations\Create; + use ApiOperations\Retrieve; + use ApiOperations\Update; + + const BILLING_ADDRESS_COLLECTION_AUTO = 'auto'; + const BILLING_ADDRESS_COLLECTION_REQUIRED = 'required'; + + /** + * @param null|array $params + * @param null|array|string $opts + * @param mixed $id + * + * @throws \Stripe\Exception\ApiErrorException if the request fails + * + * @return \Stripe\Collection<\Stripe\PaymentLink> list of LineItems + */ + public static function allLineItems($id, $params = null, $opts = null) + { + $url = static::resourceUrl($id) . '/line_items'; + list($response, $opts) = static::_staticRequest('get', $url, $params, $opts); + $obj = \Stripe\Util\Util::convertToStripeObject($response->json, $opts); + $obj->setLastResponse($response); + + return $obj; + } +} diff --git a/vendor/stripe/stripe-php/lib/Plan.php b/vendor/stripe/stripe-php/lib/Plan.php index 2a818e474..c3621fa6c 100644 --- a/vendor/stripe/stripe-php/lib/Plan.php +++ b/vendor/stripe/stripe-php/lib/Plan.php @@ -22,7 +22,7 @@ namespace Stripe; * Related guides: Set up * a subscription and more about products and prices. + * href="https://stripe.com/docs/products-prices/overview">products and prices. * * @property string $id Unique identifier for the object. * @property string $object String representing the object's type. Objects of the same type share the same value. diff --git a/vendor/stripe/stripe-php/lib/Price.php b/vendor/stripe/stripe-php/lib/Price.php index 878a7a2c4..f2f31b20d 100644 --- a/vendor/stripe/stripe-php/lib/Price.php +++ b/vendor/stripe/stripe-php/lib/Price.php @@ -20,8 +20,8 @@ namespace Stripe; * href="https://stripe.com/docs/billing/subscriptions/set-up-subscription">Set up * a subscription, create an invoice, - * and more about products - * and prices. + * and more about products and prices. * * @property string $id Unique identifier for the object. * @property string $object String representing the object's type. Objects of the same type share the same value. diff --git a/vendor/stripe/stripe-php/lib/Product.php b/vendor/stripe/stripe-php/lib/Product.php index 316409692..5ea23eab8 100644 --- a/vendor/stripe/stripe-php/lib/Product.php +++ b/vendor/stripe/stripe-php/lib/Product.php @@ -9,14 +9,16 @@ namespace Stripe; * For example, you might offer a Standard and Premium version of your goods or * service; each version would be a separate Product. They can be used in * conjunction with Prices to - * configure pricing in Checkout and Subscriptions. + * configure pricing in Payment Links, Checkout, and Subscriptions. * * Related guides: Set up - * a subscription or accept one-time - * payments with Checkout and more about Products and Prices + * a subscription, share a Payment + * Link, accept + * payments with Checkout, and more about Products and Prices * * @property string $id Unique identifier for the object. * @property string $object String representing the object's type. Objects of the same type share the same value. diff --git a/vendor/stripe/stripe-php/lib/PromotionCode.php b/vendor/stripe/stripe-php/lib/PromotionCode.php index f4bb0f4f1..2457add49 100644 --- a/vendor/stripe/stripe-php/lib/PromotionCode.php +++ b/vendor/stripe/stripe-php/lib/PromotionCode.php @@ -12,7 +12,7 @@ namespace Stripe; * @property string $object String representing the object's type. Objects of the same type share the same value. * @property bool $active Whether the promotion code is currently active. A promotion code is only active if the coupon is also valid. * @property string $code The customer-facing code. Regardless of case, this code must be unique across all active promotion codes for each customer. - * @property \Stripe\Coupon $coupon A coupon contains information about a percent-off or amount-off discount you might want to apply to a customer. Coupons may be applied to invoices or orders. Coupons do not work with conventional one-off charges. + * @property \Stripe\Coupon $coupon A coupon contains information about a percent-off or amount-off discount you might want to apply to a customer. Coupons may be applied to invoices or orders. Coupons do not work with conventional one-off charges. * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch. * @property null|string|\Stripe\Customer $customer The customer that this promotion code can be used by. * @property null|int $expires_at Date at which the promotion code can no longer be redeemed. diff --git a/vendor/stripe/stripe-php/lib/Quote.php b/vendor/stripe/stripe-php/lib/Quote.php index 67fc62723..fd6b4eee0 100644 --- a/vendor/stripe/stripe-php/lib/Quote.php +++ b/vendor/stripe/stripe-php/lib/Quote.php @@ -30,7 +30,7 @@ namespace Stripe; * @property null|string $header A header that will be displayed on the quote PDF. * @property null|string|\Stripe\Invoice $invoice The invoice that was created from this quote. * @property null|\Stripe\StripeObject $invoice_settings All invoices will be billed using the specified settings. - * @property \Stripe\Collection $line_items A list of items the customer is being quoted for. + * @property \Stripe\Collection<\Stripe\LineItem> $line_items A list of items the customer is being quoted for. * @property bool $livemode Has the value true if the object exists in live mode or the value false if the object exists in test mode. * @property \Stripe\StripeObject $metadata Set of key-value pairs that you can attach to an object. This can be useful for storing additional information about the object in a structured format. * @property null|string $number A unique number that identifies this particular quote. This number is assigned once the quote is finalized. @@ -136,7 +136,7 @@ class Quote extends ApiResource * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection list of LineItems + * @return \Stripe\Collection<\Stripe\Quote> list of LineItems */ public static function allComputedUpfrontLineItems($id, $params = null, $opts = null) { @@ -155,7 +155,7 @@ class Quote extends ApiResource * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection list of LineItems + * @return \Stripe\Collection<\Stripe\Quote> list of LineItems */ public static function allLineItems($id, $params = null, $opts = null) { diff --git a/vendor/stripe/stripe-php/lib/Radar/ValueList.php b/vendor/stripe/stripe-php/lib/Radar/ValueList.php index ad374325d..8cd62236f 100644 --- a/vendor/stripe/stripe-php/lib/Radar/ValueList.php +++ b/vendor/stripe/stripe-php/lib/Radar/ValueList.php @@ -18,7 +18,7 @@ namespace Stripe\Radar; * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch. * @property string $created_by The name or email address of the user who created this value list. * @property string $item_type The type of items in the value list. One of card_fingerprint, card_bin, email, ip_address, country, string, case_sensitive_string, or customer_id. - * @property \Stripe\Collection $list_items List of items contained within this value list. + * @property \Stripe\Collection<\Stripe\Radar\ValueListItem> $list_items List of items contained within this value list. * @property bool $livemode Has the value true if the object exists in live mode or the value false if the object exists in test mode. * @property \Stripe\StripeObject $metadata Set of key-value pairs that you can attach to an object. This can be useful for storing additional information about the object in a structured format. * @property string $name The name of the value list. diff --git a/vendor/stripe/stripe-php/lib/Recipient.php b/vendor/stripe/stripe-php/lib/Recipient.php index 8d5ad4c0a..75155b53b 100644 --- a/vendor/stripe/stripe-php/lib/Recipient.php +++ b/vendor/stripe/stripe-php/lib/Recipient.php @@ -19,7 +19,7 @@ namespace Stripe; * @property string $id Unique identifier for the object. * @property string $object String representing the object's type. Objects of the same type share the same value. * @property null|\Stripe\BankAccount $active_account Hash describing the current account on the recipient, if there is one. - * @property null|\Stripe\Collection $cards + * @property null|\Stripe\Collection<\Stripe\Card> $cards * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch. * @property null|string|\Stripe\Card $default_card The default card to use for creating transfers to this recipient. * @property null|string $description An arbitrary string attached to the object. Often useful for displaying to users. diff --git a/vendor/stripe/stripe-php/lib/Refund.php b/vendor/stripe/stripe-php/lib/Refund.php index f5e975fd8..ddff61658 100644 --- a/vendor/stripe/stripe-php/lib/Refund.php +++ b/vendor/stripe/stripe-php/lib/Refund.php @@ -43,6 +43,7 @@ class Refund extends ApiResource const FAILURE_REASON_UNKNOWN = 'unknown'; const REASON_DUPLICATE = 'duplicate'; + const REASON_EXPIRED_UNCAPTURED_CHARGE = 'expired_uncaptured_charge'; const REASON_FRAUDULENT = 'fraudulent'; const REASON_REQUESTED_BY_CUSTOMER = 'requested_by_customer'; diff --git a/vendor/stripe/stripe-php/lib/Service/AccountService.php b/vendor/stripe/stripe-php/lib/Service/AccountService.php index e69c5ee90..4ef217d57 100644 --- a/vendor/stripe/stripe-php/lib/Service/AccountService.php +++ b/vendor/stripe/stripe-php/lib/Service/AccountService.php @@ -15,7 +15,7 @@ class AccountService extends \Stripe\Service\AbstractService * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection + * @return \Stripe\Collection<\Stripe\Account> */ public function all($params = null, $opts = null) { @@ -33,7 +33,7 @@ class AccountService extends \Stripe\Service\AbstractService * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection + * @return \Stripe\Collection<\Stripe\Capability> */ public function allCapabilities($parentId, $params = null, $opts = null) { @@ -49,7 +49,7 @@ class AccountService extends \Stripe\Service\AbstractService * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection + * @return \Stripe\Collection<\Stripe\BankAccount|\Stripe\Card> */ public function allExternalAccounts($parentId, $params = null, $opts = null) { @@ -67,7 +67,7 @@ class AccountService extends \Stripe\Service\AbstractService * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection + * @return \Stripe\Collection<\Stripe\Person> */ public function allPersons($parentId, $params = null, $opts = null) { @@ -148,9 +148,10 @@ class AccountService extends \Stripe\Service\AbstractService /** * With Connect, you can delete accounts you manage. * - * Accounts created using test-mode keys can be deleted at any time. Custom or - * Express accounts created using live-mode keys can only be deleted once all - * balances are zero. + * Accounts created using test-mode keys can be deleted at any time. Standard + * accounts created using live-mode keys cannot be deleted. Custom or Express + * accounts created using live-mode keys can only be deleted once all balances are + * zero. * * If you want to delete your own account, use the account information tab in your diff --git a/vendor/stripe/stripe-php/lib/Service/ApplePayDomainService.php b/vendor/stripe/stripe-php/lib/Service/ApplePayDomainService.php index 6577b6b62..3a076f472 100644 --- a/vendor/stripe/stripe-php/lib/Service/ApplePayDomainService.php +++ b/vendor/stripe/stripe-php/lib/Service/ApplePayDomainService.php @@ -14,7 +14,7 @@ class ApplePayDomainService extends \Stripe\Service\AbstractService * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection + * @return \Stripe\Collection<\Stripe\ApplePayDomain> */ public function all($params = null, $opts = null) { diff --git a/vendor/stripe/stripe-php/lib/Service/ApplicationFeeService.php b/vendor/stripe/stripe-php/lib/Service/ApplicationFeeService.php index c05c3cd59..138c3794e 100644 --- a/vendor/stripe/stripe-php/lib/Service/ApplicationFeeService.php +++ b/vendor/stripe/stripe-php/lib/Service/ApplicationFeeService.php @@ -15,7 +15,7 @@ class ApplicationFeeService extends \Stripe\Service\AbstractService * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection + * @return \Stripe\Collection<\Stripe\ApplicationFee> */ public function all($params = null, $opts = null) { @@ -35,7 +35,7 @@ class ApplicationFeeService extends \Stripe\Service\AbstractService * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection + * @return \Stripe\Collection<\Stripe\ApplicationFeeRefund> */ public function allRefunds($parentId, $params = null, $opts = null) { diff --git a/vendor/stripe/stripe-php/lib/Service/BalanceTransactionService.php b/vendor/stripe/stripe-php/lib/Service/BalanceTransactionService.php index fb1da5018..9e6d37c04 100644 --- a/vendor/stripe/stripe-php/lib/Service/BalanceTransactionService.php +++ b/vendor/stripe/stripe-php/lib/Service/BalanceTransactionService.php @@ -19,7 +19,7 @@ class BalanceTransactionService extends \Stripe\Service\AbstractService * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection + * @return \Stripe\Collection<\Stripe\BalanceTransaction> */ public function all($params = null, $opts = null) { diff --git a/vendor/stripe/stripe-php/lib/Service/BillingPortal/ConfigurationService.php b/vendor/stripe/stripe-php/lib/Service/BillingPortal/ConfigurationService.php index 5a0d70db7..11d1a5a3a 100644 --- a/vendor/stripe/stripe-php/lib/Service/BillingPortal/ConfigurationService.php +++ b/vendor/stripe/stripe-php/lib/Service/BillingPortal/ConfigurationService.php @@ -15,7 +15,7 @@ class ConfigurationService extends \Stripe\Service\AbstractService * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection + * @return \Stripe\Collection<\Stripe\BillingPortal\Configuration> */ public function all($params = null, $opts = null) { diff --git a/vendor/stripe/stripe-php/lib/Service/ChargeService.php b/vendor/stripe/stripe-php/lib/Service/ChargeService.php index f8960edfb..568254589 100644 --- a/vendor/stripe/stripe-php/lib/Service/ChargeService.php +++ b/vendor/stripe/stripe-php/lib/Service/ChargeService.php @@ -15,7 +15,7 @@ class ChargeService extends \Stripe\Service\AbstractService * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection + * @return \Stripe\Collection<\Stripe\Charge> */ public function all($params = null, $opts = null) { diff --git a/vendor/stripe/stripe-php/lib/Service/Checkout/SessionService.php b/vendor/stripe/stripe-php/lib/Service/Checkout/SessionService.php index b42ab8a17..a2938d0a9 100644 --- a/vendor/stripe/stripe-php/lib/Service/Checkout/SessionService.php +++ b/vendor/stripe/stripe-php/lib/Service/Checkout/SessionService.php @@ -14,7 +14,7 @@ class SessionService extends \Stripe\Service\AbstractService * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection + * @return \Stripe\Collection<\Stripe\Checkout\Session> */ public function all($params = null, $opts = null) { @@ -33,7 +33,7 @@ class SessionService extends \Stripe\Service\AbstractService * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection + * @return \Stripe\Collection<\Stripe\LineItem> */ public function allLineItems($parentId, $params = null, $opts = null) { diff --git a/vendor/stripe/stripe-php/lib/Service/CoreServiceFactory.php b/vendor/stripe/stripe-php/lib/Service/CoreServiceFactory.php index 540d24d50..edaadd3fa 100644 --- a/vendor/stripe/stripe-php/lib/Service/CoreServiceFactory.php +++ b/vendor/stripe/stripe-php/lib/Service/CoreServiceFactory.php @@ -35,6 +35,7 @@ namespace Stripe\Service; * @property OrderReturnService $orderReturns * @property OrderService $orders * @property PaymentIntentService $paymentIntents + * @property PaymentLinkService $paymentLinks * @property PaymentMethodService $paymentMethods * @property PayoutService $payouts * @property PlanService $plans @@ -97,6 +98,7 @@ class CoreServiceFactory extends \Stripe\Service\AbstractServiceFactory 'orderReturns' => OrderReturnService::class, 'orders' => OrderService::class, 'paymentIntents' => PaymentIntentService::class, + 'paymentLinks' => PaymentLinkService::class, 'paymentMethods' => PaymentMethodService::class, 'payouts' => PayoutService::class, 'plans' => PlanService::class, diff --git a/vendor/stripe/stripe-php/lib/Service/CountrySpecService.php b/vendor/stripe/stripe-php/lib/Service/CountrySpecService.php index 573444fd3..8f3869fee 100644 --- a/vendor/stripe/stripe-php/lib/Service/CountrySpecService.php +++ b/vendor/stripe/stripe-php/lib/Service/CountrySpecService.php @@ -14,7 +14,7 @@ class CountrySpecService extends \Stripe\Service\AbstractService * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection + * @return \Stripe\Collection<\Stripe\CountrySpec> */ public function all($params = null, $opts = null) { diff --git a/vendor/stripe/stripe-php/lib/Service/CouponService.php b/vendor/stripe/stripe-php/lib/Service/CouponService.php index 82a880f53..89eb2c7d1 100644 --- a/vendor/stripe/stripe-php/lib/Service/CouponService.php +++ b/vendor/stripe/stripe-php/lib/Service/CouponService.php @@ -14,7 +14,7 @@ class CouponService extends \Stripe\Service\AbstractService * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection + * @return \Stripe\Collection<\Stripe\Coupon> */ public function all($params = null, $opts = null) { diff --git a/vendor/stripe/stripe-php/lib/Service/CreditNoteService.php b/vendor/stripe/stripe-php/lib/Service/CreditNoteService.php index 23681402e..5c631328a 100644 --- a/vendor/stripe/stripe-php/lib/Service/CreditNoteService.php +++ b/vendor/stripe/stripe-php/lib/Service/CreditNoteService.php @@ -14,7 +14,7 @@ class CreditNoteService extends \Stripe\Service\AbstractService * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection + * @return \Stripe\Collection<\Stripe\CreditNote> */ public function all($params = null, $opts = null) { @@ -32,7 +32,7 @@ class CreditNoteService extends \Stripe\Service\AbstractService * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection + * @return \Stripe\Collection<\Stripe\CreditNoteLineItem> */ public function allLines($parentId, $params = null, $opts = null) { @@ -98,7 +98,7 @@ class CreditNoteService extends \Stripe\Service\AbstractService * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection + * @return \Stripe\Collection<\Stripe\CreditNote> */ public function previewLines($params = null, $opts = null) { diff --git a/vendor/stripe/stripe-php/lib/Service/CustomerService.php b/vendor/stripe/stripe-php/lib/Service/CustomerService.php index 50dddec49..fbe3a3d6e 100644 --- a/vendor/stripe/stripe-php/lib/Service/CustomerService.php +++ b/vendor/stripe/stripe-php/lib/Service/CustomerService.php @@ -15,7 +15,7 @@ class CustomerService extends \Stripe\Service\AbstractService * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection + * @return \Stripe\Collection<\Stripe\Customer> */ public function all($params = null, $opts = null) { @@ -32,7 +32,7 @@ class CustomerService extends \Stripe\Service\AbstractService * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection + * @return \Stripe\Collection<\Stripe\CustomerBalanceTransaction> */ public function allBalanceTransactions($parentId, $params = null, $opts = null) { @@ -48,7 +48,7 @@ class CustomerService extends \Stripe\Service\AbstractService * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection + * @return \Stripe\Collection<\Stripe\Customer> */ public function allPaymentMethods($id, $params = null, $opts = null) { @@ -64,7 +64,7 @@ class CustomerService extends \Stripe\Service\AbstractService * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection + * @return \Stripe\Collection<\Stripe\AlipayAccount|\Stripe\BankAccount|\Stripe\BitcoinReceiver|\Stripe\Card|\Stripe\Source> */ public function allSources($parentId, $params = null, $opts = null) { @@ -80,7 +80,7 @@ class CustomerService extends \Stripe\Service\AbstractService * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection + * @return \Stripe\Collection<\Stripe\TaxId> */ public function allTaxIds($parentId, $params = null, $opts = null) { @@ -223,8 +223,7 @@ class CustomerService extends \Stripe\Service\AbstractService } /** - * Retrieves the details of an existing customer. You need only supply the unique - * customer identifier that was returned upon customer creation. + * Retrieves a Customer object. * * @param string $id * @param null|array $params diff --git a/vendor/stripe/stripe-php/lib/Service/DisputeService.php b/vendor/stripe/stripe-php/lib/Service/DisputeService.php index 4eb1542bf..86d3584a0 100644 --- a/vendor/stripe/stripe-php/lib/Service/DisputeService.php +++ b/vendor/stripe/stripe-php/lib/Service/DisputeService.php @@ -14,7 +14,7 @@ class DisputeService extends \Stripe\Service\AbstractService * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection + * @return \Stripe\Collection<\Stripe\Dispute> */ public function all($params = null, $opts = null) { diff --git a/vendor/stripe/stripe-php/lib/Service/EventService.php b/vendor/stripe/stripe-php/lib/Service/EventService.php index 430b35abf..9e779dd9a 100644 --- a/vendor/stripe/stripe-php/lib/Service/EventService.php +++ b/vendor/stripe/stripe-php/lib/Service/EventService.php @@ -18,7 +18,7 @@ class EventService extends \Stripe\Service\AbstractService * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection + * @return \Stripe\Collection<\Stripe\Event> */ public function all($params = null, $opts = null) { diff --git a/vendor/stripe/stripe-php/lib/Service/ExchangeRateService.php b/vendor/stripe/stripe-php/lib/Service/ExchangeRateService.php index fc78410c7..fe010b00d 100644 --- a/vendor/stripe/stripe-php/lib/Service/ExchangeRateService.php +++ b/vendor/stripe/stripe-php/lib/Service/ExchangeRateService.php @@ -15,7 +15,7 @@ class ExchangeRateService extends \Stripe\Service\AbstractService * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection + * @return \Stripe\Collection<\Stripe\ExchangeRate> */ public function all($params = null, $opts = null) { diff --git a/vendor/stripe/stripe-php/lib/Service/FileLinkService.php b/vendor/stripe/stripe-php/lib/Service/FileLinkService.php index 7a3a435dd..06929a9c6 100644 --- a/vendor/stripe/stripe-php/lib/Service/FileLinkService.php +++ b/vendor/stripe/stripe-php/lib/Service/FileLinkService.php @@ -14,7 +14,7 @@ class FileLinkService extends \Stripe\Service\AbstractService * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection + * @return \Stripe\Collection<\Stripe\FileLink> */ public function all($params = null, $opts = null) { diff --git a/vendor/stripe/stripe-php/lib/Service/FileService.php b/vendor/stripe/stripe-php/lib/Service/FileService.php index 148428849..82ef0e500 100644 --- a/vendor/stripe/stripe-php/lib/Service/FileService.php +++ b/vendor/stripe/stripe-php/lib/Service/FileService.php @@ -16,7 +16,7 @@ class FileService extends \Stripe\Service\AbstractService * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection + * @return \Stripe\Collection<\Stripe\File> */ public function all($params = null, $opts = null) { diff --git a/vendor/stripe/stripe-php/lib/Service/Identity/VerificationReportService.php b/vendor/stripe/stripe-php/lib/Service/Identity/VerificationReportService.php index 0393cd565..9289d9dfd 100644 --- a/vendor/stripe/stripe-php/lib/Service/Identity/VerificationReportService.php +++ b/vendor/stripe/stripe-php/lib/Service/Identity/VerificationReportService.php @@ -14,7 +14,7 @@ class VerificationReportService extends \Stripe\Service\AbstractService * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection + * @return \Stripe\Collection<\Stripe\Identity\VerificationReport> */ public function all($params = null, $opts = null) { diff --git a/vendor/stripe/stripe-php/lib/Service/Identity/VerificationSessionService.php b/vendor/stripe/stripe-php/lib/Service/Identity/VerificationSessionService.php index 1a763bef3..24bb4e063 100644 --- a/vendor/stripe/stripe-php/lib/Service/Identity/VerificationSessionService.php +++ b/vendor/stripe/stripe-php/lib/Service/Identity/VerificationSessionService.php @@ -14,7 +14,7 @@ class VerificationSessionService extends \Stripe\Service\AbstractService * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection + * @return \Stripe\Collection<\Stripe\Identity\VerificationSession> */ public function all($params = null, $opts = null) { diff --git a/vendor/stripe/stripe-php/lib/Service/InvoiceItemService.php b/vendor/stripe/stripe-php/lib/Service/InvoiceItemService.php index 0f0b9e91f..45e207218 100644 --- a/vendor/stripe/stripe-php/lib/Service/InvoiceItemService.php +++ b/vendor/stripe/stripe-php/lib/Service/InvoiceItemService.php @@ -15,7 +15,7 @@ class InvoiceItemService extends \Stripe\Service\AbstractService * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection + * @return \Stripe\Collection<\Stripe\InvoiceItem> */ public function all($params = null, $opts = null) { diff --git a/vendor/stripe/stripe-php/lib/Service/InvoiceService.php b/vendor/stripe/stripe-php/lib/Service/InvoiceService.php index 4e2efe696..73c1a8fe2 100644 --- a/vendor/stripe/stripe-php/lib/Service/InvoiceService.php +++ b/vendor/stripe/stripe-php/lib/Service/InvoiceService.php @@ -16,7 +16,7 @@ class InvoiceService extends \Stripe\Service\AbstractService * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection + * @return \Stripe\Collection<\Stripe\Invoice> */ public function all($params = null, $opts = null) { @@ -35,7 +35,7 @@ class InvoiceService extends \Stripe\Service\AbstractService * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection + * @return \Stripe\Collection<\Stripe\LineItem> */ public function allLines($parentId, $params = null, $opts = null) { @@ -221,7 +221,7 @@ class InvoiceService extends \Stripe\Service\AbstractService * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection + * @return \Stripe\Collection<\Stripe\Invoice> */ public function upcomingLines($params = null, $opts = null) { diff --git a/vendor/stripe/stripe-php/lib/Service/Issuing/AuthorizationService.php b/vendor/stripe/stripe-php/lib/Service/Issuing/AuthorizationService.php index 6fff70e7e..6517688f6 100644 --- a/vendor/stripe/stripe-php/lib/Service/Issuing/AuthorizationService.php +++ b/vendor/stripe/stripe-php/lib/Service/Issuing/AuthorizationService.php @@ -16,7 +16,7 @@ class AuthorizationService extends \Stripe\Service\AbstractService * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection + * @return \Stripe\Collection<\Stripe\Issuing\Authorization> */ public function all($params = null, $opts = null) { diff --git a/vendor/stripe/stripe-php/lib/Service/Issuing/CardService.php b/vendor/stripe/stripe-php/lib/Service/Issuing/CardService.php index 346d54afa..22b7e5412 100644 --- a/vendor/stripe/stripe-php/lib/Service/Issuing/CardService.php +++ b/vendor/stripe/stripe-php/lib/Service/Issuing/CardService.php @@ -16,7 +16,7 @@ class CardService extends \Stripe\Service\AbstractService * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection + * @return \Stripe\Collection<\Stripe\Issuing\Card> */ public function all($params = null, $opts = null) { diff --git a/vendor/stripe/stripe-php/lib/Service/Issuing/CardholderService.php b/vendor/stripe/stripe-php/lib/Service/Issuing/CardholderService.php index 5731b1bf1..65e675b36 100644 --- a/vendor/stripe/stripe-php/lib/Service/Issuing/CardholderService.php +++ b/vendor/stripe/stripe-php/lib/Service/Issuing/CardholderService.php @@ -16,7 +16,7 @@ class CardholderService extends \Stripe\Service\AbstractService * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection + * @return \Stripe\Collection<\Stripe\Issuing\Cardholder> */ public function all($params = null, $opts = null) { diff --git a/vendor/stripe/stripe-php/lib/Service/Issuing/DisputeService.php b/vendor/stripe/stripe-php/lib/Service/Issuing/DisputeService.php index ab5df5f3e..45c252888 100644 --- a/vendor/stripe/stripe-php/lib/Service/Issuing/DisputeService.php +++ b/vendor/stripe/stripe-php/lib/Service/Issuing/DisputeService.php @@ -16,7 +16,7 @@ class DisputeService extends \Stripe\Service\AbstractService * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection + * @return \Stripe\Collection<\Stripe\Issuing\Dispute> */ public function all($params = null, $opts = null) { diff --git a/vendor/stripe/stripe-php/lib/Service/Issuing/TransactionService.php b/vendor/stripe/stripe-php/lib/Service/Issuing/TransactionService.php index 8fb0ee2ac..dd83b1820 100644 --- a/vendor/stripe/stripe-php/lib/Service/Issuing/TransactionService.php +++ b/vendor/stripe/stripe-php/lib/Service/Issuing/TransactionService.php @@ -16,7 +16,7 @@ class TransactionService extends \Stripe\Service\AbstractService * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection + * @return \Stripe\Collection<\Stripe\Issuing\Transaction> */ public function all($params = null, $opts = null) { diff --git a/vendor/stripe/stripe-php/lib/Service/OrderReturnService.php b/vendor/stripe/stripe-php/lib/Service/OrderReturnService.php index 6183166c5..b98af5f3f 100644 --- a/vendor/stripe/stripe-php/lib/Service/OrderReturnService.php +++ b/vendor/stripe/stripe-php/lib/Service/OrderReturnService.php @@ -15,7 +15,7 @@ class OrderReturnService extends \Stripe\Service\AbstractService * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection + * @return \Stripe\Collection<\Stripe\OrderReturn> */ public function all($params = null, $opts = null) { diff --git a/vendor/stripe/stripe-php/lib/Service/OrderService.php b/vendor/stripe/stripe-php/lib/Service/OrderService.php index fa658fa7b..9da8a3dbb 100644 --- a/vendor/stripe/stripe-php/lib/Service/OrderService.php +++ b/vendor/stripe/stripe-php/lib/Service/OrderService.php @@ -15,7 +15,7 @@ class OrderService extends \Stripe\Service\AbstractService * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection + * @return \Stripe\Collection<\Stripe\Order> */ public function all($params = null, $opts = null) { diff --git a/vendor/stripe/stripe-php/lib/Service/PaymentIntentService.php b/vendor/stripe/stripe-php/lib/Service/PaymentIntentService.php index 912cec14d..3bfe708df 100644 --- a/vendor/stripe/stripe-php/lib/Service/PaymentIntentService.php +++ b/vendor/stripe/stripe-php/lib/Service/PaymentIntentService.php @@ -14,7 +14,7 @@ class PaymentIntentService extends \Stripe\Service\AbstractService * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection + * @return \Stripe\Collection<\Stripe\PaymentIntent> */ public function all($params = null, $opts = null) { @@ -179,4 +179,20 @@ class PaymentIntentService extends \Stripe\Service\AbstractService { return $this->request('post', $this->buildPath('/v1/payment_intents/%s', $id), $params, $opts); } + + /** + * Verifies microdeposits on a PaymentIntent object. + * + * @param string $id + * @param null|array $params + * @param null|array|\Stripe\Util\RequestOptions $opts + * + * @throws \Stripe\Exception\ApiErrorException if the request fails + * + * @return \Stripe\PaymentIntent + */ + public function verifyMicrodeposits($id, $params = null, $opts = null) + { + return $this->request('post', $this->buildPath('/v1/payment_intents/%s/verify_microdeposits', $id), $params, $opts); + } } diff --git a/vendor/stripe/stripe-php/lib/Service/PaymentLinkService.php b/vendor/stripe/stripe-php/lib/Service/PaymentLinkService.php new file mode 100644 index 000000000..902cee09c --- /dev/null +++ b/vendor/stripe/stripe-php/lib/Service/PaymentLinkService.php @@ -0,0 +1,89 @@ + + */ + public function all($params = null, $opts = null) + { + return $this->requestCollection('get', '/v1/payment_links', $params, $opts); + } + + /** + * When retrieving a payment link, there is an includable + * line_items property containing the first handful of those + * items. There is also a URL where you can retrieve the full (paginated) list of + * line items. + * + * @param string $id + * @param null|array $params + * @param null|array|\Stripe\Util\RequestOptions $opts + * + * @throws \Stripe\Exception\ApiErrorException if the request fails + * + * @return \Stripe\Collection<\Stripe\PaymentLink> + */ + public function allLineItems($id, $params = null, $opts = null) + { + return $this->requestCollection('get', $this->buildPath('/v1/payment_links/%s/line_items', $id), $params, $opts); + } + + /** + * Creates a payment link. + * + * @param null|array $params + * @param null|array|\Stripe\Util\RequestOptions $opts + * + * @throws \Stripe\Exception\ApiErrorException if the request fails + * + * @return \Stripe\PaymentLink + */ + public function create($params = null, $opts = null) + { + return $this->request('post', '/v1/payment_links', $params, $opts); + } + + /** + * Retrieve a payment link. + * + * @param string $id + * @param null|array $params + * @param null|array|\Stripe\Util\RequestOptions $opts + * + * @throws \Stripe\Exception\ApiErrorException if the request fails + * + * @return \Stripe\PaymentLink + */ + public function retrieve($id, $params = null, $opts = null) + { + return $this->request('get', $this->buildPath('/v1/payment_links/%s', $id), $params, $opts); + } + + /** + * Updates a payment link. + * + * @param string $id + * @param null|array $params + * @param null|array|\Stripe\Util\RequestOptions $opts + * + * @throws \Stripe\Exception\ApiErrorException if the request fails + * + * @return \Stripe\PaymentLink + */ + public function update($id, $params = null, $opts = null) + { + return $this->request('post', $this->buildPath('/v1/payment_links/%s', $id), $params, $opts); + } +} diff --git a/vendor/stripe/stripe-php/lib/Service/PaymentMethodService.php b/vendor/stripe/stripe-php/lib/Service/PaymentMethodService.php index e7f341a0b..33ba21179 100644 --- a/vendor/stripe/stripe-php/lib/Service/PaymentMethodService.php +++ b/vendor/stripe/stripe-php/lib/Service/PaymentMethodService.php @@ -16,7 +16,7 @@ class PaymentMethodService extends \Stripe\Service\AbstractService * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection + * @return \Stripe\Collection<\Stripe\PaymentMethod> */ public function all($params = null, $opts = null) { diff --git a/vendor/stripe/stripe-php/lib/Service/PayoutService.php b/vendor/stripe/stripe-php/lib/Service/PayoutService.php index 547e22da6..4ca3561c8 100644 --- a/vendor/stripe/stripe-php/lib/Service/PayoutService.php +++ b/vendor/stripe/stripe-php/lib/Service/PayoutService.php @@ -16,7 +16,7 @@ class PayoutService extends \Stripe\Service\AbstractService * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection + * @return \Stripe\Collection<\Stripe\Payout> */ public function all($params = null, $opts = null) { diff --git a/vendor/stripe/stripe-php/lib/Service/PlanService.php b/vendor/stripe/stripe-php/lib/Service/PlanService.php index 16625d27a..6c0a8d47a 100644 --- a/vendor/stripe/stripe-php/lib/Service/PlanService.php +++ b/vendor/stripe/stripe-php/lib/Service/PlanService.php @@ -14,7 +14,7 @@ class PlanService extends \Stripe\Service\AbstractService * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection + * @return \Stripe\Collection<\Stripe\Plan> */ public function all($params = null, $opts = null) { diff --git a/vendor/stripe/stripe-php/lib/Service/PriceService.php b/vendor/stripe/stripe-php/lib/Service/PriceService.php index cc44f69c9..e1c850c52 100644 --- a/vendor/stripe/stripe-php/lib/Service/PriceService.php +++ b/vendor/stripe/stripe-php/lib/Service/PriceService.php @@ -14,7 +14,7 @@ class PriceService extends \Stripe\Service\AbstractService * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection + * @return \Stripe\Collection<\Stripe\Price> */ public function all($params = null, $opts = null) { diff --git a/vendor/stripe/stripe-php/lib/Service/ProductService.php b/vendor/stripe/stripe-php/lib/Service/ProductService.php index 850cea56f..0e2eae7a9 100644 --- a/vendor/stripe/stripe-php/lib/Service/ProductService.php +++ b/vendor/stripe/stripe-php/lib/Service/ProductService.php @@ -15,7 +15,7 @@ class ProductService extends \Stripe\Service\AbstractService * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection + * @return \Stripe\Collection<\Stripe\Product> */ public function all($params = null, $opts = null) { diff --git a/vendor/stripe/stripe-php/lib/Service/PromotionCodeService.php b/vendor/stripe/stripe-php/lib/Service/PromotionCodeService.php index 1de5696da..17461b4bf 100644 --- a/vendor/stripe/stripe-php/lib/Service/PromotionCodeService.php +++ b/vendor/stripe/stripe-php/lib/Service/PromotionCodeService.php @@ -14,7 +14,7 @@ class PromotionCodeService extends \Stripe\Service\AbstractService * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection + * @return \Stripe\Collection<\Stripe\PromotionCode> */ public function all($params = null, $opts = null) { @@ -38,7 +38,10 @@ class PromotionCodeService extends \Stripe\Service\AbstractService } /** - * Retrieves the promotion code with the given ID. + * Retrieves the promotion code with the given ID. In order to retrieve a promotion + * code by the customer-facing code use list with the desired + * code. * * @param string $id * @param null|array $params diff --git a/vendor/stripe/stripe-php/lib/Service/QuoteService.php b/vendor/stripe/stripe-php/lib/Service/QuoteService.php index 96f12a5c3..d6d20c0b4 100644 --- a/vendor/stripe/stripe-php/lib/Service/QuoteService.php +++ b/vendor/stripe/stripe-php/lib/Service/QuoteService.php @@ -30,7 +30,7 @@ class QuoteService extends \Stripe\Service\AbstractService * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection + * @return \Stripe\Collection<\Stripe\Quote> */ public function all($params = null, $opts = null) { @@ -49,7 +49,7 @@ class QuoteService extends \Stripe\Service\AbstractService * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection + * @return \Stripe\Collection<\Stripe\Quote> */ public function allComputedUpfrontLineItems($id, $params = null, $opts = null) { @@ -67,7 +67,7 @@ class QuoteService extends \Stripe\Service\AbstractService * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection + * @return \Stripe\Collection<\Stripe\Quote> */ public function allLineItems($id, $params = null, $opts = null) { diff --git a/vendor/stripe/stripe-php/lib/Service/Radar/EarlyFraudWarningService.php b/vendor/stripe/stripe-php/lib/Service/Radar/EarlyFraudWarningService.php index 7b0973483..be119b4c8 100644 --- a/vendor/stripe/stripe-php/lib/Service/Radar/EarlyFraudWarningService.php +++ b/vendor/stripe/stripe-php/lib/Service/Radar/EarlyFraudWarningService.php @@ -14,7 +14,7 @@ class EarlyFraudWarningService extends \Stripe\Service\AbstractService * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection + * @return \Stripe\Collection<\Stripe\Radar\EarlyFraudWarning> */ public function all($params = null, $opts = null) { diff --git a/vendor/stripe/stripe-php/lib/Service/Radar/ValueListItemService.php b/vendor/stripe/stripe-php/lib/Service/Radar/ValueListItemService.php index 89eba2a7a..b9da3dd8b 100644 --- a/vendor/stripe/stripe-php/lib/Service/Radar/ValueListItemService.php +++ b/vendor/stripe/stripe-php/lib/Service/Radar/ValueListItemService.php @@ -16,7 +16,7 @@ class ValueListItemService extends \Stripe\Service\AbstractService * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection + * @return \Stripe\Collection<\Stripe\Radar\ValueListItem> */ public function all($params = null, $opts = null) { diff --git a/vendor/stripe/stripe-php/lib/Service/Radar/ValueListService.php b/vendor/stripe/stripe-php/lib/Service/Radar/ValueListService.php index 64ac2ee79..70d9b4863 100644 --- a/vendor/stripe/stripe-php/lib/Service/Radar/ValueListService.php +++ b/vendor/stripe/stripe-php/lib/Service/Radar/ValueListService.php @@ -16,7 +16,7 @@ class ValueListService extends \Stripe\Service\AbstractService * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection + * @return \Stripe\Collection<\Stripe\Radar\ValueList> */ public function all($params = null, $opts = null) { diff --git a/vendor/stripe/stripe-php/lib/Service/RefundService.php b/vendor/stripe/stripe-php/lib/Service/RefundService.php index 49b4267e4..cfbef54c5 100644 --- a/vendor/stripe/stripe-php/lib/Service/RefundService.php +++ b/vendor/stripe/stripe-php/lib/Service/RefundService.php @@ -17,7 +17,7 @@ class RefundService extends \Stripe\Service\AbstractService * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection + * @return \Stripe\Collection<\Stripe\Refund> */ public function all($params = null, $opts = null) { diff --git a/vendor/stripe/stripe-php/lib/Service/Reporting/ReportRunService.php b/vendor/stripe/stripe-php/lib/Service/Reporting/ReportRunService.php index 692420cd4..b62898fdb 100644 --- a/vendor/stripe/stripe-php/lib/Service/Reporting/ReportRunService.php +++ b/vendor/stripe/stripe-php/lib/Service/Reporting/ReportRunService.php @@ -14,7 +14,7 @@ class ReportRunService extends \Stripe\Service\AbstractService * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection + * @return \Stripe\Collection<\Stripe\Reporting\ReportRun> */ public function all($params = null, $opts = null) { diff --git a/vendor/stripe/stripe-php/lib/Service/Reporting/ReportTypeService.php b/vendor/stripe/stripe-php/lib/Service/Reporting/ReportTypeService.php index e1b4ea521..7fa503821 100644 --- a/vendor/stripe/stripe-php/lib/Service/Reporting/ReportTypeService.php +++ b/vendor/stripe/stripe-php/lib/Service/Reporting/ReportTypeService.php @@ -14,7 +14,7 @@ class ReportTypeService extends \Stripe\Service\AbstractService * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection + * @return \Stripe\Collection<\Stripe\Reporting\ReportType> */ public function all($params = null, $opts = null) { diff --git a/vendor/stripe/stripe-php/lib/Service/ReviewService.php b/vendor/stripe/stripe-php/lib/Service/ReviewService.php index ea152f23e..3bcd325b6 100644 --- a/vendor/stripe/stripe-php/lib/Service/ReviewService.php +++ b/vendor/stripe/stripe-php/lib/Service/ReviewService.php @@ -16,7 +16,7 @@ class ReviewService extends \Stripe\Service\AbstractService * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection + * @return \Stripe\Collection<\Stripe\Review> */ public function all($params = null, $opts = null) { diff --git a/vendor/stripe/stripe-php/lib/Service/SetupAttemptService.php b/vendor/stripe/stripe-php/lib/Service/SetupAttemptService.php index 7376ea13e..8657441ec 100644 --- a/vendor/stripe/stripe-php/lib/Service/SetupAttemptService.php +++ b/vendor/stripe/stripe-php/lib/Service/SetupAttemptService.php @@ -14,7 +14,7 @@ class SetupAttemptService extends \Stripe\Service\AbstractService * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection + * @return \Stripe\Collection<\Stripe\SetupAttempt> */ public function all($params = null, $opts = null) { diff --git a/vendor/stripe/stripe-php/lib/Service/SetupIntentService.php b/vendor/stripe/stripe-php/lib/Service/SetupIntentService.php index 3cbec506f..3dea24cbc 100644 --- a/vendor/stripe/stripe-php/lib/Service/SetupIntentService.php +++ b/vendor/stripe/stripe-php/lib/Service/SetupIntentService.php @@ -14,7 +14,7 @@ class SetupIntentService extends \Stripe\Service\AbstractService * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection + * @return \Stripe\Collection<\Stripe\SetupIntent> */ public function all($params = null, $opts = null) { @@ -124,4 +124,20 @@ class SetupIntentService extends \Stripe\Service\AbstractService { return $this->request('post', $this->buildPath('/v1/setup_intents/%s', $id), $params, $opts); } + + /** + * Verifies microdeposits on a SetupIntent object. + * + * @param string $id + * @param null|array $params + * @param null|array|\Stripe\Util\RequestOptions $opts + * + * @throws \Stripe\Exception\ApiErrorException if the request fails + * + * @return \Stripe\SetupIntent + */ + public function verifyMicrodeposits($id, $params = null, $opts = null) + { + return $this->request('post', $this->buildPath('/v1/setup_intents/%s/verify_microdeposits', $id), $params, $opts); + } } diff --git a/vendor/stripe/stripe-php/lib/Service/ShippingRateService.php b/vendor/stripe/stripe-php/lib/Service/ShippingRateService.php index d7b55a8b3..d141e484e 100644 --- a/vendor/stripe/stripe-php/lib/Service/ShippingRateService.php +++ b/vendor/stripe/stripe-php/lib/Service/ShippingRateService.php @@ -14,7 +14,7 @@ class ShippingRateService extends \Stripe\Service\AbstractService * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection + * @return \Stripe\Collection<\Stripe\ShippingRate> */ public function all($params = null, $opts = null) { diff --git a/vendor/stripe/stripe-php/lib/Service/Sigma/ScheduledQueryRunService.php b/vendor/stripe/stripe-php/lib/Service/Sigma/ScheduledQueryRunService.php index 92641751b..0fa8cd9ca 100644 --- a/vendor/stripe/stripe-php/lib/Service/Sigma/ScheduledQueryRunService.php +++ b/vendor/stripe/stripe-php/lib/Service/Sigma/ScheduledQueryRunService.php @@ -14,7 +14,7 @@ class ScheduledQueryRunService extends \Stripe\Service\AbstractService * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection + * @return \Stripe\Collection<\Stripe\Sigma\ScheduledQueryRun> */ public function all($params = null, $opts = null) { diff --git a/vendor/stripe/stripe-php/lib/Service/SkuService.php b/vendor/stripe/stripe-php/lib/Service/SkuService.php index 8934f2064..c00194ea3 100644 --- a/vendor/stripe/stripe-php/lib/Service/SkuService.php +++ b/vendor/stripe/stripe-php/lib/Service/SkuService.php @@ -15,7 +15,7 @@ class SkuService extends \Stripe\Service\AbstractService * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection + * @return \Stripe\Collection<\Stripe\SKU> */ public function all($params = null, $opts = null) { diff --git a/vendor/stripe/stripe-php/lib/Service/SubscriptionItemService.php b/vendor/stripe/stripe-php/lib/Service/SubscriptionItemService.php index 3b2aa2b12..e18c8de41 100644 --- a/vendor/stripe/stripe-php/lib/Service/SubscriptionItemService.php +++ b/vendor/stripe/stripe-php/lib/Service/SubscriptionItemService.php @@ -14,7 +14,7 @@ class SubscriptionItemService extends \Stripe\Service\AbstractService * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection + * @return \Stripe\Collection<\Stripe\SubscriptionItem> */ public function all($params = null, $opts = null) { @@ -39,7 +39,7 @@ class SubscriptionItemService extends \Stripe\Service\AbstractService * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection + * @return \Stripe\Collection<\Stripe\UsageRecordSummary> */ public function allUsageRecordSummaries($parentId, $params = null, $opts = null) { diff --git a/vendor/stripe/stripe-php/lib/Service/SubscriptionScheduleService.php b/vendor/stripe/stripe-php/lib/Service/SubscriptionScheduleService.php index 9eed46060..42aaf6bbe 100644 --- a/vendor/stripe/stripe-php/lib/Service/SubscriptionScheduleService.php +++ b/vendor/stripe/stripe-php/lib/Service/SubscriptionScheduleService.php @@ -14,7 +14,7 @@ class SubscriptionScheduleService extends \Stripe\Service\AbstractService * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection + * @return \Stripe\Collection<\Stripe\SubscriptionSchedule> */ public function all($params = null, $opts = null) { diff --git a/vendor/stripe/stripe-php/lib/Service/SubscriptionService.php b/vendor/stripe/stripe-php/lib/Service/SubscriptionService.php index f3ac768c8..8369e9975 100644 --- a/vendor/stripe/stripe-php/lib/Service/SubscriptionService.php +++ b/vendor/stripe/stripe-php/lib/Service/SubscriptionService.php @@ -15,7 +15,7 @@ class SubscriptionService extends \Stripe\Service\AbstractService * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection + * @return \Stripe\Collection<\Stripe\Subscription> */ public function all($params = null, $opts = null) { diff --git a/vendor/stripe/stripe-php/lib/Service/TaxCodeService.php b/vendor/stripe/stripe-php/lib/Service/TaxCodeService.php index 007b77136..1e5bbfeb4 100644 --- a/vendor/stripe/stripe-php/lib/Service/TaxCodeService.php +++ b/vendor/stripe/stripe-php/lib/Service/TaxCodeService.php @@ -15,7 +15,7 @@ class TaxCodeService extends \Stripe\Service\AbstractService * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection + * @return \Stripe\Collection<\Stripe\TaxCode> */ public function all($params = null, $opts = null) { diff --git a/vendor/stripe/stripe-php/lib/Service/TaxRateService.php b/vendor/stripe/stripe-php/lib/Service/TaxRateService.php index 7cee1fead..0d67eec33 100644 --- a/vendor/stripe/stripe-php/lib/Service/TaxRateService.php +++ b/vendor/stripe/stripe-php/lib/Service/TaxRateService.php @@ -15,7 +15,7 @@ class TaxRateService extends \Stripe\Service\AbstractService * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection + * @return \Stripe\Collection<\Stripe\TaxRate> */ public function all($params = null, $opts = null) { diff --git a/vendor/stripe/stripe-php/lib/Service/Terminal/LocationService.php b/vendor/stripe/stripe-php/lib/Service/Terminal/LocationService.php index 8adc7a520..74a776eb9 100644 --- a/vendor/stripe/stripe-php/lib/Service/Terminal/LocationService.php +++ b/vendor/stripe/stripe-php/lib/Service/Terminal/LocationService.php @@ -14,7 +14,7 @@ class LocationService extends \Stripe\Service\AbstractService * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection + * @return \Stripe\Collection<\Stripe\Terminal\Location> */ public function all($params = null, $opts = null) { @@ -22,7 +22,9 @@ class LocationService extends \Stripe\Service\AbstractService } /** - * Creates a new Location object. + * Creates a new Location object. For further details, including which + * address fields are required in each country, see the Manage locations guide. * * @param null|array $params * @param null|array|\Stripe\Util\RequestOptions $opts diff --git a/vendor/stripe/stripe-php/lib/Service/Terminal/ReaderService.php b/vendor/stripe/stripe-php/lib/Service/Terminal/ReaderService.php index 765015c83..413bc8715 100644 --- a/vendor/stripe/stripe-php/lib/Service/Terminal/ReaderService.php +++ b/vendor/stripe/stripe-php/lib/Service/Terminal/ReaderService.php @@ -14,7 +14,7 @@ class ReaderService extends \Stripe\Service\AbstractService * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection + * @return \Stripe\Collection<\Stripe\Terminal\Reader> */ public function all($params = null, $opts = null) { diff --git a/vendor/stripe/stripe-php/lib/Service/TopupService.php b/vendor/stripe/stripe-php/lib/Service/TopupService.php index 059dc2090..bd486b9e2 100644 --- a/vendor/stripe/stripe-php/lib/Service/TopupService.php +++ b/vendor/stripe/stripe-php/lib/Service/TopupService.php @@ -14,7 +14,7 @@ class TopupService extends \Stripe\Service\AbstractService * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection + * @return \Stripe\Collection<\Stripe\Topup> */ public function all($params = null, $opts = null) { diff --git a/vendor/stripe/stripe-php/lib/Service/TransferService.php b/vendor/stripe/stripe-php/lib/Service/TransferService.php index 150bbf731..4a78545e0 100644 --- a/vendor/stripe/stripe-php/lib/Service/TransferService.php +++ b/vendor/stripe/stripe-php/lib/Service/TransferService.php @@ -16,7 +16,7 @@ class TransferService extends \Stripe\Service\AbstractService * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection + * @return \Stripe\Collection<\Stripe\Transfer> */ public function all($params = null, $opts = null) { @@ -36,7 +36,7 @@ class TransferService extends \Stripe\Service\AbstractService * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection + * @return \Stripe\Collection<\Stripe\TransferReversal> */ public function allReversals($parentId, $params = null, $opts = null) { diff --git a/vendor/stripe/stripe-php/lib/Service/WebhookEndpointService.php b/vendor/stripe/stripe-php/lib/Service/WebhookEndpointService.php index 01e642249..baa15bd24 100644 --- a/vendor/stripe/stripe-php/lib/Service/WebhookEndpointService.php +++ b/vendor/stripe/stripe-php/lib/Service/WebhookEndpointService.php @@ -14,7 +14,7 @@ class WebhookEndpointService extends \Stripe\Service\AbstractService * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection + * @return \Stripe\Collection<\Stripe\WebhookEndpoint> */ public function all($params = null, $opts = null) { diff --git a/vendor/stripe/stripe-php/lib/SetupIntent.php b/vendor/stripe/stripe-php/lib/SetupIntent.php index 081bb2d47..13ba54193 100644 --- a/vendor/stripe/stripe-php/lib/SetupIntent.php +++ b/vendor/stripe/stripe-php/lib/SetupIntent.php @@ -111,4 +111,21 @@ class SetupIntent extends ApiResource return $this; } + + /** + * @param null|array $params + * @param null|array|string $opts + * + * @throws \Stripe\Exception\ApiErrorException if the request fails + * + * @return \Stripe\SetupIntent the verified setup intent + */ + public function verifyMicrodeposits($params = null, $opts = null) + { + $url = $this->instanceUrl() . '/verify_microdeposits'; + list($response, $opts) = $this->_request('post', $url, $params, $opts); + $this->refreshFrom($response, $opts); + + return $this; + } } diff --git a/vendor/stripe/stripe-php/lib/Stripe.php b/vendor/stripe/stripe-php/lib/Stripe.php index 54795c5fc..9eed6295d 100644 --- a/vendor/stripe/stripe-php/lib/Stripe.php +++ b/vendor/stripe/stripe-php/lib/Stripe.php @@ -58,7 +58,7 @@ class Stripe /** @var float Initial delay between retries, in seconds */ private static $initialNetworkRetryDelay = 0.5; - const VERSION = '7.105.0'; + const VERSION = '7.114.0'; /** * @return string the API key used for requests diff --git a/vendor/stripe/stripe-php/lib/StripeClient.php b/vendor/stripe/stripe-php/lib/StripeClient.php index 10d324a94..89b4c6be6 100644 --- a/vendor/stripe/stripe-php/lib/StripeClient.php +++ b/vendor/stripe/stripe-php/lib/StripeClient.php @@ -35,6 +35,7 @@ namespace Stripe; * @property \Stripe\Service\OrderReturnService $orderReturns * @property \Stripe\Service\OrderService $orders * @property \Stripe\Service\PaymentIntentService $paymentIntents + * @property \Stripe\Service\PaymentLinkService $paymentLinks * @property \Stripe\Service\PaymentMethodService $paymentMethods * @property \Stripe\Service\PayoutService $payouts * @property \Stripe\Service\PlanService $plans diff --git a/vendor/stripe/stripe-php/lib/Subscription.php b/vendor/stripe/stripe-php/lib/Subscription.php index a96b53bce..1b91e384d 100644 --- a/vendor/stripe/stripe-php/lib/Subscription.php +++ b/vendor/stripe/stripe-php/lib/Subscription.php @@ -31,7 +31,7 @@ namespace Stripe; * @property null|\Stripe\TaxRate[] $default_tax_rates The tax rates that will apply to any subscription item that does not have tax_rates set. Invoices created will have their default_tax_rates populated from the subscription. * @property null|\Stripe\Discount $discount Describes the current discount applied to this subscription, if there is one. When billing, a discount applied to a subscription overrides a discount applied on a customer-wide basis. * @property null|int $ended_at If the subscription has ended, the date the subscription ended. - * @property \Stripe\Collection $items List of subscription items, each with an attached price. + * @property \Stripe\Collection<\Stripe\SubscriptionItem> $items List of subscription items, each with an attached price. * @property null|string|\Stripe\Invoice $latest_invoice The most recent invoice this subscription has generated. * @property bool $livemode Has the value true if the object exists in live mode or the value false if the object exists in test mode. * @property \Stripe\StripeObject $metadata Set of key-value pairs that you can attach to an object. This can be useful for storing additional information about the object in a structured format. diff --git a/vendor/stripe/stripe-php/lib/SubscriptionItem.php b/vendor/stripe/stripe-php/lib/SubscriptionItem.php index 5bd25b252..36afdf831 100644 --- a/vendor/stripe/stripe-php/lib/SubscriptionItem.php +++ b/vendor/stripe/stripe-php/lib/SubscriptionItem.php @@ -13,8 +13,8 @@ namespace Stripe; * @property null|\Stripe\StripeObject $billing_thresholds Define thresholds at which an invoice will be sent, and the related subscription advanced to a new billing period * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch. * @property \Stripe\StripeObject $metadata Set of key-value pairs that you can attach to an object. This can be useful for storing additional information about the object in a structured format. - * @property \Stripe\Plan $plan

You can now model subscriptions more flexibly using the Prices API. It replaces the Plans API and is backwards compatible to simplify your migration.

Plans define the base price, currency, and billing cycle for recurring purchases of products. Products help you track inventory or provisioning, and plans help you track pricing. Different physical goods or levels of service should be represented by products, and pricing options should be represented by plans. This approach lets you change prices without having to change your provisioning scheme.

For example, you might have a single "gold" product that has plans for $10/month, $100/year, €9/month, and €90/year.

Related guides: Set up a subscription and more about products and prices.

- * @property \Stripe\Price $price

Prices define the unit cost, currency, and (optional) billing cycle for both recurring and one-time purchases of products. Products help you track inventory or provisioning, and prices help you track payment terms. Different physical goods or levels of service should be represented by products, and pricing options should be represented by prices. This approach lets you change prices without having to change your provisioning scheme.

For example, you might have a single "gold" product that has prices for $10/month, $100/year, and €9 once.

Related guides: Set up a subscription, create an invoice, and more about products and prices.

+ * @property \Stripe\Plan $plan

You can now model subscriptions more flexibly using the Prices API. It replaces the Plans API and is backwards compatible to simplify your migration.

Plans define the base price, currency, and billing cycle for recurring purchases of products. Products help you track inventory or provisioning, and plans help you track pricing. Different physical goods or levels of service should be represented by products, and pricing options should be represented by plans. This approach lets you change prices without having to change your provisioning scheme.

For example, you might have a single "gold" product that has plans for $10/month, $100/year, €9/month, and €90/year.

Related guides: Set up a subscription and more about products and prices.

+ * @property \Stripe\Price $price

Prices define the unit cost, currency, and (optional) billing cycle for both recurring and one-time purchases of products. Products help you track inventory or provisioning, and prices help you track payment terms. Different physical goods or levels of service should be represented by products, and pricing options should be represented by prices. This approach lets you change prices without having to change your provisioning scheme.

For example, you might have a single "gold" product that has prices for $10/month, $100/year, and €9 once.

Related guides: Set up a subscription, create an invoice, and more about products and prices.

* @property int $quantity The quantity of the plan to which the customer should be subscribed. * @property string $subscription The subscription this subscription_item belongs to. * @property null|\Stripe\TaxRate[] $tax_rates The tax rates which apply to this subscription_item. When set, the default_tax_rates on the subscription do not apply to this subscription_item. @@ -75,7 +75,7 @@ class SubscriptionItem extends ApiResource * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection the list of usage record summaries + * @return \Stripe\Collection<\Stripe\UsageRecordSummary> the list of usage record summaries */ public static function allUsageRecordSummaries($id, $params = null, $opts = null) { diff --git a/vendor/stripe/stripe-php/lib/TaxId.php b/vendor/stripe/stripe-php/lib/TaxId.php index 3a8b73286..b9ab44ac2 100644 --- a/vendor/stripe/stripe-php/lib/TaxId.php +++ b/vendor/stripe/stripe-php/lib/TaxId.php @@ -18,7 +18,7 @@ namespace Stripe; * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch. * @property null|string|\Stripe\Customer $customer ID of the customer. * @property bool $livemode Has the value true if the object exists in live mode or the value false if the object exists in test mode. - * @property string $type Type of the tax ID, one of ae_trn, au_abn, au_arn, br_cnpj, br_cpf, ca_bn, ca_gst_hst, ca_pst_bc, ca_pst_mb, ca_pst_sk, ca_qst, ch_vat, cl_tin, es_cif, eu_vat, gb_vat, hk_br, id_npwp, il_vat, in_gst, jp_cn, jp_rn, kr_brn, li_uid, mx_rfc, my_frp, my_itn, my_sst, no_vat, nz_gst, ru_inn, ru_kpp, sa_vat, sg_gst, sg_uen, th_vat, tw_vat, us_ein, or za_vat. Note that some legacy tax IDs have type unknown + * @property string $type Type of the tax ID, one of ae_trn, au_abn, au_arn, br_cnpj, br_cpf, ca_bn, ca_gst_hst, ca_pst_bc, ca_pst_mb, ca_pst_sk, ca_qst, ch_vat, cl_tin, es_cif, eu_vat, gb_vat, ge_vat, hk_br, id_npwp, il_vat, in_gst, is_vat, jp_cn, jp_rn, kr_brn, li_uid, mx_rfc, my_frp, my_itn, my_sst, no_vat, nz_gst, ru_inn, ru_kpp, sa_vat, sg_gst, sg_uen, th_vat, tw_vat, ua_vat, us_ein, or za_vat. Note that some legacy tax IDs have type unknown * @property string $value Value of the tax ID. * @property null|\Stripe\StripeObject $verification Tax ID verification information. */ @@ -44,10 +44,12 @@ class TaxId extends ApiResource const TYPE_ES_CIF = 'es_cif'; const TYPE_EU_VAT = 'eu_vat'; const TYPE_GB_VAT = 'gb_vat'; + const TYPE_GE_VAT = 'ge_vat'; const TYPE_HK_BR = 'hk_br'; const TYPE_ID_NPWP = 'id_npwp'; const TYPE_IL_VAT = 'il_vat'; const TYPE_IN_GST = 'in_gst'; + const TYPE_IS_VAT = 'is_vat'; const TYPE_JP_CN = 'jp_cn'; const TYPE_JP_RN = 'jp_rn'; const TYPE_KR_BRN = 'kr_brn'; @@ -65,6 +67,7 @@ class TaxId extends ApiResource const TYPE_SG_UEN = 'sg_uen'; const TYPE_TH_VAT = 'th_vat'; const TYPE_TW_VAT = 'tw_vat'; + const TYPE_UA_VAT = 'ua_vat'; const TYPE_UNKNOWN = 'unknown'; const TYPE_US_EIN = 'us_ein'; const TYPE_ZA_VAT = 'za_vat'; diff --git a/vendor/stripe/stripe-php/lib/Transfer.php b/vendor/stripe/stripe-php/lib/Transfer.php index 4fb0c6a64..fed09bb97 100644 --- a/vendor/stripe/stripe-php/lib/Transfer.php +++ b/vendor/stripe/stripe-php/lib/Transfer.php @@ -30,7 +30,7 @@ namespace Stripe; * @property string|\Stripe\Charge $destination_payment If the destination is a Stripe account, this will be the ID of the payment that the destination account received for the transfer. * @property bool $livemode Has the value true if the object exists in live mode or the value false if the object exists in test mode. * @property \Stripe\StripeObject $metadata Set of key-value pairs that you can attach to an object. This can be useful for storing additional information about the object in a structured format. - * @property \Stripe\Collection $reversals A list of reversals that have been applied to the transfer. + * @property \Stripe\Collection<\Stripe\TransferReversal> $reversals A list of reversals that have been applied to the transfer. * @property bool $reversed Whether the transfer has been fully reversed. If the transfer is only partially reversed, this attribute will still be false. * @property null|string|\Stripe\Charge $source_transaction ID of the charge or payment that was used to fund the transfer. If null, the transfer was funded from the available balance. * @property null|string $source_type The source balance this transfer came from. One of card, fpx, or bank_account. @@ -77,7 +77,7 @@ class Transfer extends ApiResource * * @throws \Stripe\Exception\ApiErrorException if the request fails * - * @return \Stripe\Collection the list of transfer reversals + * @return \Stripe\Collection<\Stripe\TransferReversal> the list of transfer reversals */ public static function allReversals($id, $params = null, $opts = null) { diff --git a/vendor/stripe/stripe-php/lib/Util/ObjectTypes.php b/vendor/stripe/stripe-php/lib/Util/ObjectTypes.php index f60effdd1..4546cff06 100644 --- a/vendor/stripe/stripe-php/lib/Util/ObjectTypes.php +++ b/vendor/stripe/stripe-php/lib/Util/ObjectTypes.php @@ -60,6 +60,7 @@ class ObjectTypes \Stripe\OrderItem::OBJECT_NAME => \Stripe\OrderItem::class, \Stripe\OrderReturn::OBJECT_NAME => \Stripe\OrderReturn::class, \Stripe\PaymentIntent::OBJECT_NAME => \Stripe\PaymentIntent::class, + \Stripe\PaymentLink::OBJECT_NAME => \Stripe\PaymentLink::class, \Stripe\PaymentMethod::OBJECT_NAME => \Stripe\PaymentMethod::class, \Stripe\Payout::OBJECT_NAME => \Stripe\Payout::class, \Stripe\Person::OBJECT_NAME => \Stripe\Person::class, diff --git a/vendor/symfony/polyfill-intl-idn/bootstrap80.php b/vendor/symfony/polyfill-intl-idn/bootstrap80.php index a42ab81ac..a62c2d69b 100644 --- a/vendor/symfony/polyfill-intl-idn/bootstrap80.php +++ b/vendor/symfony/polyfill-intl-idn/bootstrap80.php @@ -118,8 +118,8 @@ if (!defined('IDNA_ERROR_CONTEXTJ')) { } if (!function_exists('idn_to_ascii')) { - function idn_to_ascii(?string $domain, ?int $flags = 0, ?int $variant = INTL_IDNA_VARIANT_UTS46, &$idna_info = null): string|false { return p\Idn::idn_to_ascii((string) $domain, (int) $flags, (int) $variant, $idna_info); } + function idn_to_ascii(?string $domain, ?int $flags = IDNA_DEFAULT, ?int $variant = INTL_IDNA_VARIANT_UTS46, &$idna_info = null): string|false { return p\Idn::idn_to_ascii((string) $domain, (int) $flags, (int) $variant, $idna_info); } } if (!function_exists('idn_to_utf8')) { - function idn_to_utf8(?string $domain, ?int $flags = 0, ?int $variant = INTL_IDNA_VARIANT_UTS46, &$idna_info = null): string|false { return p\Idn::idn_to_utf8((string) $domain, (int) $flags, (int) $variant, $idna_info); } + function idn_to_utf8(?string $domain, ?int $flags = IDNA_DEFAULT, ?int $variant = INTL_IDNA_VARIANT_UTS46, &$idna_info = null): string|false { return p\Idn::idn_to_utf8((string) $domain, (int) $flags, (int) $variant, $idna_info); } }