diff --git a/admin/survey/SurveyAdmin.php b/admin/survey/SurveyAdmin.php index c49c0f7ae..14e3bacd9 100644 --- a/admin/survey/SurveyAdmin.php +++ b/admin/survey/SurveyAdmin.php @@ -897,16 +897,18 @@ class SurveyAdmin echo '
'; - echo ''; + echo '
    '; + // Moje ankete + echo '
  1. '; + echo ' '; + echo '
    2. '; - echo '
      '; + if ($this->skin == 0 && $this->isAnketar == false) { - if ($this->skin == 0 /*&& $this->checkDostopAktiven()*/ && $this->isAnketar == false) { - - echo '
    1. '; + echo '
    2. '; if ($d->checkDostopSub('dashboard')) echo ''; @@ -933,13 +935,11 @@ class SurveyAdmin echo '
      3. '; } - echo '
    3. '; + echo '
    4. '; if ($d->checkDostopSub('edit') && $hierarhija_type < 5) { echo ''; } - echo '
       
      '; echo '
      ' . $lang['srv_vprasalnik'] . '
      '; - //echo $css_urejanjeRight; if ($d->checkDostopSub('edit') && $hierarhija_type < 5) { echo '      '; } @@ -948,16 +948,14 @@ class SurveyAdmin # testiranje - ne prikazemo v glasovanju if ($this->survey_type != 0 && $this->survey_type != 1) { - echo '
    5. '; + echo '
    6. '; if ($d->checkDostopSub('test')) { echo ''; } echo '
      ' . $lang['srv_testiranje'] . '
      '; - //echo $css_testiranjeRight; if ($d->checkDostopSub('test')) { echo '      '; } - echo '
      7. '; } @@ -970,7 +968,7 @@ class SurveyAdmin $link = A_VABILA; } - echo '
    7. '; + echo '
    8. '; if ($d->checkDostopSub('publish')) { echo ''; } @@ -984,12 +982,11 @@ class SurveyAdmin // Podatki - ne prikazemo v glasovanju if ($this->survey_type != 0) { - echo '
    9. '; + echo '
    10. '; if ($d->checkDostopSub('data')) { echo ''; } echo '
      ' . $lang['srv_results'] . '
      '; - //echo $css_dataRight; if ($d->checkDostopSub('data')) { echo '      '; } @@ -1008,17 +1005,14 @@ class SurveyAdmin $_goto_m = '&m=' . M_ANALYSIS_SUMMARY; } - echo '
    11. '; - + echo '
    12. '; if ($d->checkDostopSub('analyse') && !isset($modules['hierarhija'])) { echo ''; - } elseif ($d->checkDostopSub('analyse') && isset($modules['hierarhija'])) { echo ''; } echo '
      ' . $lang['srv_analiza'] . '
      '; - if ($d->checkDostopSub('analyse')) { echo '      '; } @@ -1029,7 +1023,7 @@ class SurveyAdmin $d = new Dostop(); if ($d->checkDostopAktiven()) { - echo '
        '; + echo '
          '; # Komentarji SurveySetting::getInstance()->Init($this->anketa); @@ -1135,14 +1129,12 @@ class SurveyAdmin # zavhiki dodatnih nastavitev - echo '
            '; + echo '
              '; # MAZA - mobilna aplikacija za anketirance if (isset($modules['maza'])) { $css = ($this->first_action == A_MAZA) ? 'on' : 'off'; - echo '
            1.  
              2. '; - echo '
            2. '; echo ''; echo ''; @@ -1153,8 +1145,6 @@ class SurveyAdmin if (isset($modules['wpn'])) { $css = ($this->first_action == A_WPN) ? 'on' : 'off'; - echo '
            3.  
              4. '; - echo '
            4. '; echo ''; echo ''; @@ -1165,8 +1155,6 @@ class SurveyAdmin if (isset($modules['phone'])) { $css = ($this->first_action == NAVI_PHONE) ? 'on' : 'off'; - echo '
            5.  
              6. '; - echo '
            6. '; # če je navadni user in anketar if ($this->isAnketar) { @@ -1182,8 +1170,6 @@ class SurveyAdmin if (isset($modules['slideshow'])) { $css = ($this->first_action == NAVI_SLIDESHOW) ? 'on' : 'off'; - echo '
            7.  
              8. '; - echo '
            8. '; echo ''; echo ''; @@ -1194,8 +1180,6 @@ class SurveyAdmin if (isset($modules['uporabnost'])) { $css = ($this->first_action == NAVI_UPORABNOST) ? 'on' : 'off'; - echo '
            9.  
              10. '; - echo '
            10. '; echo ''; echo ''; @@ -1206,8 +1190,6 @@ class SurveyAdmin if ($row['user_from_cms'] >= 1) { $css = ($this->first_action == NAVI_VNOS) ? 'on' : 'off'; - echo '
            11.  
              12. '; - echo '
            12. '; echo ''; echo ''; @@ -1218,8 +1200,6 @@ class SurveyAdmin if (isset($modules['social_network'])) { $css = ($this->first_action == NAVI_VNOS) ? 'on' : 'off'; - echo '
            13.  
              14. '; - echo '
            14. '; echo ''; echo ''; @@ -1230,8 +1210,6 @@ class SurveyAdmin if (isset($modules['quiz'])) { $css = ($this->first_action == A_KVIZ) ? 'on' : 'off'; - echo '
            15.  
              16. '; - echo '
            16. '; echo ''; echo ''; @@ -1242,8 +1220,6 @@ class SurveyAdmin if (isset($modules['voting'])) { $css = ($this->first_action == A_VOTING) ? 'on' : 'off'; - echo '
            17.  
              18. '; - echo '
            18. '; echo ''; echo ''; @@ -1254,8 +1230,6 @@ class SurveyAdmin if (isset($modules['advanced_paradata'])) { $css = ($this->first_action == A_ADVANCED_PARADATA) ? 'on' : 'off'; - echo '
            19.  
              20. '; - echo '
            20. '; echo ''; echo ''; @@ -1266,8 +1240,6 @@ class SurveyAdmin if (isset($modules['excell_matrix'])) { $css = ($this->first_action == 'excell_matrix') ? 'on' : 'off'; - echo '
            21.  
              22. '; - echo '
            22. '; echo ''; echo ''; @@ -1278,8 +1250,6 @@ class SurveyAdmin if (isset($modules['chat'])) { $css = ($this->first_action == A_CHAT) ? 'on' : 'off'; - echo '
            23.  
              24. '; - echo '
            24. '; echo ''; echo ''; @@ -1290,8 +1260,6 @@ class SurveyAdmin if (isset($modules['panel'])) { $css = ($this->first_action == A_PANEL) ? 'on' : 'off'; - echo '
            25.  
              26. '; - echo '
            26. '; echo ''; echo ''; @@ -1302,8 +1270,6 @@ class SurveyAdmin if (isset($modules['evoli'])) { $css = ($this->first_action == 'evoli') ? 'on' : 'off'; - echo '
            27.  
              28. '; - echo '
            28. '; echo ''; echo ''; @@ -1314,8 +1280,6 @@ class SurveyAdmin if (isset($modules['evoli_teammeter'])) { $css = ($this->first_action == 'evoli_teammeter') ? 'on' : 'off'; - echo '
            29.  
              30. '; - echo '
            30. '; echo ''; echo ''; @@ -1326,8 +1290,6 @@ class SurveyAdmin if (isset($modules['evoli_quality_climate'])) { $css = ($this->first_action == 'evoli_quality_climate') ? 'on' : 'off'; - echo '
            31.  
              32. '; - echo '
            32. '; echo ''; echo ''; @@ -1338,8 +1300,6 @@ class SurveyAdmin if (isset($modules['evoli_teamship_meter'])) { $css = ($this->first_action == 'evoli_teamship_meter') ? 'on' : 'off'; - echo '
            33.  
              34. '; - echo '
            34. '; echo ''; echo ''; @@ -1350,8 +1310,6 @@ class SurveyAdmin if (isset($modules['evoli_organizational_employeeship_meter'])) { $css = ($this->first_action == 'evoli_organizational_employeeship_meter') ? 'on' : 'off'; - echo '
            35.  
              36. '; - echo '
            36. '; echo ''; echo ''; @@ -1362,8 +1320,6 @@ class SurveyAdmin if (isset($modules['evoli_employmeter'])) { $css = ($this->first_action == 'evoli_employmeter') ? 'on' : 'off'; - echo '
            37.  
              38. '; - echo '
            38. '; echo ''; echo ''; @@ -1374,8 +1330,6 @@ class SurveyAdmin if (isset($modules['mfdps'])) { $css = ($this->first_action == 'mfdps') ? 'on' : 'off'; - echo '
            39.  
              40. '; - echo '
            40. '; echo ''; echo ''; @@ -1386,8 +1340,6 @@ class SurveyAdmin if (isset($modules['borza'])) { $css = ($this->first_action == 'borza') ? 'on' : 'off'; - echo '
            41.  
              42. '; - echo '
            42. '; echo ''; echo ''; @@ -1398,8 +1350,6 @@ class SurveyAdmin if (isset($modules['mju'])) { $css = ($this->first_action == 'mju') ? 'on' : 'off'; - echo '
            43.  
              44. '; - echo '
            44. '; echo ''; echo ''; @@ -1410,8 +1360,6 @@ class SurveyAdmin if (isset($modules['360_stopinj'])) { $css = ($this->first_action == '360_stopinj') ? 'on' : 'off'; - echo '
            45.  
              46. '; - echo '
            46. '; echo ''; echo ''; @@ -1422,8 +1370,6 @@ class SurveyAdmin if (isset($modules['360_stopinj_1ka'])) { $css = ($this->first_action == '360_stopinj_1ka') ? 'on' : 'off'; - echo '
            47.  
              48. '; - echo '
            48. '; echo ''; echo ''; @@ -1433,8 +1379,6 @@ class SurveyAdmin # GDPR $gdpr = new GDPR(); if (true /*$gdpr->isGDPRSurvey($this->anketa)*/) { - - echo '
            49.  
              50. '; echo '
            50. '; echo ''; @@ -1444,7 +1388,6 @@ class SurveyAdmin } # SA - hierarhija if (isset($modules['hierarhija'])) { - echo '
            51.  
              52. '; echo '
            52. '; if($modules['hierarhija'] == 1) { @@ -1469,7 +1412,6 @@ class SurveyAdmin echo '
              53. '; } elseif(UserSetting::getInstance()->getUserSetting('showSAicon') && $admin_type < 3){ - echo '
            53.  
              54. '; echo '
            54. '; echo ''; @@ -1507,77 +1449,66 @@ class SurveyAdmin # podzavihek: urejanje ankete if ($this->first_action == NAVI_UREJANJE) { - echo '
                '; + echo ''; + + # link arhivi if (!$this->isAnketar) { echo ''; } } # podzavihek: testiranje if ($this->first_action == NAVI_TESTIRANJE) { - //$tab = $_GET['m']; + echo ''; - echo '
                  '; + # link arhivi - echo '
                • '; - echo ''; - echo /*'' .*/ $lang['srv_analiza_arhiv']; + echo '
                    '; + + echo '
                  • '; + echo ''; + echo $lang['srv_analiza_arhiv']; echo ''; echo '
                    • '; @@ -1761,50 +1674,44 @@ class SurveyAdmin echo ''; + + # link arhivi if ($d->checkDostopSub('edit')) { + echo '
                      '; - # link arhivi - echo '
                    • '; - echo ''; - //echo $lang['srv_analiza_arhiv']; - echo /*'' .*/ $lang['srv_analiza_arhiv']; + + echo '
                    • '; + echo ''; + echo $lang['srv_analiza_arhiv']; echo ''; echo '
                      • '; @@ -1838,7 +1745,7 @@ class SurveyAdmin || isset($modules['quiz']) || isset($modules['social_network']) || isset($modules['slideshow'])) ? '' : ' side-right'; - echo '
                    • '; + echo '
                    • ' . $lang['srv_uporabnost'] . '
                      • '; } # vnos @@ -1847,7 +1754,7 @@ class SurveyAdmin $_right = (isset($modules['quiz']) || isset($modules['social_network']) || isset($modules['slideshow'])) ? '' : ' side-right'; - echo '
                    • '; + echo '
                    • ' . $lang['srv_vnos'] . '
                      • '; } #kviz @@ -1855,7 +1762,7 @@ class SurveyAdmin $_active = ($_GET['a'] == A_KVIZ) ? ' active' : ''; $_right = (isset($modules['social_network']) || isset($modules['slideshow'])) ? '' : ' side-right'; - echo '
                    • '; + echo '
                    • ' . $lang['srv_kviz'] . '
                      • '; } #volitve @@ -1863,7 +1770,7 @@ class SurveyAdmin $_active = ($_GET['a'] == A_VOTING) ? ' active' : ''; $_right = (isset($modules['social_network']) || isset($modules['slideshow'])) ? '' : ' side-right'; - echo '
                    • '; + echo '
                    • ' . $lang['srv_voting'] . '
                      • '; } #napredni parapodatki @@ -1871,20 +1778,20 @@ class SurveyAdmin $_active = ($_GET['a'] == A_ADVANCED_PARADATA) ? ' active' : ''; $_right = (isset($modules['advanced_paradata']) || isset($modules['advanced_paradata'])) ? '' : ' side-right'; - echo '
                    • '; + echo '
                    • ' . $lang['srv_advanced_paradata'] . '
                      • '; } # SN if (isset($modules['social_network'])) { $_active = ($_GET['a'] == A_SOCIAL_NETWORK) ? ' active' : ''; $_right = (isset($modules['slideshow'])) ? '' : ' side-right'; - echo '
                    • '; + echo '
                    • ' . $lang['srv_vrsta_survey_type_8'] . '
                      • '; } #slideshow if (isset($modules['slideshow'])) { $_active = ($_GET['a'] == A_SLIDESHOW) ? ' active' : ''; - echo '
                    • '; + echo '
                    • ' . $lang['srv_vrsta_survey_type_9'] . '
                      • '; } @@ -1910,7 +1817,6 @@ class SurveyAdmin . ' href="index.php?anketa=' . $this->anketa . '&a=' . A_REPORTI . '" title="' . $lang['srv_status_osnovni'] . '">'; echo $lang['srv_status_summary'] . ''; echo ''; - echo '
                    • '; # parapodatki (browser, os, js...) - volitve imajo to ugasnjeno if(!SurveyInfo::getInstance()->checkSurveyModule('voting')) { @@ -1919,19 +1825,15 @@ class SurveyAdmin . ' href="index.php?anketa=' . $this->anketa . '&a=' . A_PARA_GRAPH . '" title="' . $lang['srv_metapodatki'] . '">'; echo $lang['srv_metapodatki'] . ''; echo ''; - echo '
                    • '; } # neodgovori in uporabnost enot - //if ($admin_type === '0') { # non-responses echo '
                    • '; echo ''; echo $lang['srv_para_neodgovori'] . ''; echo '
                      • '; - echo '
                    • '; - //} # Gumb za novo stran napredni statusi echo '
                    • '; @@ -1939,7 +1841,6 @@ class SurveyAdmin . ' href="index.php?anketa=' . $this->anketa . '&a=' . A_STATUS_ADVANCED . '" title="' . $lang['srv_status_advanced'] . '">'; echo $lang['srv_status_advanced'] . ' >>'; echo '
                      • '; - echo '
                    • '; echo '
                    '; } @@ -1964,6 +1865,7 @@ class SurveyAdmin if($hierarhija_type < 5) { echo ''; diff --git a/admin/survey/classes/class.SurveyList.php b/admin/survey/classes/class.SurveyList.php index 433d1eaa7..f4da810b1 100644 --- a/admin/survey/classes/class.SurveyList.php +++ b/admin/survey/classes/class.SurveyList.php @@ -254,16 +254,12 @@ class SurveyList { echo $lang['n_users_list'].''; echo ''; - echo '
                  • '; - #zavihek seznam vseh uporabnikov echo '
                  • '; echo ''; echo $lang['n_users_list_all'].''; echo '
                    • '; - - echo '
                  • '; #zavihek izbrisani uporabniki echo '
                  • '; @@ -271,8 +267,6 @@ class SurveyList { .' href="index.php?a=diagnostics&t=uporabniki&m=izbrisani" title="'.$lang['n_deleted_users'].'">'; echo $lang['n_deleted_users'].''; echo '
                    • '; - - echo '
                  • '; #zavihek odjavljeni uporabniki echo '
                  • '; @@ -280,8 +274,6 @@ class SurveyList { .' href="index.php?a=diagnostics&t=uporabniki&m=nepotrjeni" title="'.$lang['n_unconfirmed_users'].'">'; echo $lang['n_unconfirmed_users'].''; echo '
                    • '; - - echo '
                  • '; #zavihek nepotrjenih uporabnikov echo '
                  • '; @@ -289,8 +281,6 @@ class SurveyList { .' href="index.php?a=diagnostics&t=uporabniki&m=odjavljeni" title="'.$lang['n_unsigned_users'].'">'; echo $lang['n_unsigned_users'].''; echo '
                    • '; - - echo '
                  • '; #zavihek sa modul echo '
                  • '; @@ -327,40 +317,30 @@ class SurveyList { echo $lang['srv_ankete'].''; echo '
                    • '; - echo '
                  • '; - echo '
                  • '; echo ''; echo $lang['srv_weekly_diagnostics'].''; echo '
                    • '; - echo '
                  • '; - echo '
                  • '; echo ''; echo $lang['srv_monthly_diagnostics'].''; echo '
                    • '; - echo '
                  • '; - echo '
                  • '; echo ''; echo $lang['srv_yearly_diagnostics'].''; echo '
                    • '; - echo '
                  • '; - echo '
                  • '; echo ''; echo $lang['srv_all_diagnostics'].''; echo '
                    • '; - echo '
                  • '; - echo '
                  • '; echo ''; @@ -383,7 +363,6 @@ class SurveyList { .' href="index.php?a=knjiznica" title="'.$lang['srv_javna_knjiznica'].'">'; echo $lang['srv_javna_knjiznica'].''; echo '
                    • '; - echo '
                  • '; # Zavihek moja knjižnica echo '
                  • '; @@ -408,42 +387,42 @@ class SurveyList { .' href="index.php?a=nastavitve&m=system" title="'.$lang['srv_settingsSystem'].'">'; echo $lang['srv_settingsSystem'].''; echo '
                    • '; - echo '
                  • '; + # Zavihek ocenjevanje trajanja echo '
                  • '; echo ''; echo $lang['srv_testiranje_predvidenicas'].''; echo '
                    • '; - echo '
                  • '; + # Zavihek mape echo '
                  • '; echo ''; echo $lang['srv_collectData'].''; echo '
                    • '; - echo '
                  • '; + # Zavihek lep url echo '
                  • '; echo ''; echo $lang['srv_nice_url'].''; echo '
                    • '; - echo '
                  • '; + # ankete z administrativnim dostopom echo '
                  • '; echo ''; echo $lang['srv_anketa_admin'].''; echo '
                    • '; - echo '
                  • '; + # zbrisane ankete echo '
                  • '; echo ''; echo $lang['srv_anketa_deleted'].''; echo '
                    • '; - echo '
                  • '; + # Zbrisani podatki echo '
                  • '; echo ''; echo '
                    • '; } - - // nastavitve uporabnika - if($admin_type == 0) - echo '
                  • '; - + echo '
                  • '; echo ''; echo $lang['srv_user_settings'].''; echo '
                    • '; - - echo '
                  • '; - + // Moj profil echo '
                  • '; echo ''; @@ -484,10 +457,7 @@ class SurveyList { echo $lang['srv_notifications_recieved'].''; echo '
                    • '; - if ($admin_type == '0') { - - echo '
                  • '; - + if ($admin_type == '0') { # poslana obvestila echo '
                  • '; echo ''; echo $lang['srv_narocila_my'].''; echo '
                    • '; - - echo '
                  • '; # placila - samo admini if ($admin_type == '0') { @@ -535,16 +503,12 @@ class SurveyList { echo $lang['srv_gdpr_user_settings'].''; echo ''; - echo '
                  • '; - // Seznam anket echo '
                  • '; echo ''; echo $lang['srv_gdpr_survey_list'].''; echo '
                    • '; - - echo '
                  • '; // DPA echo '
                  • '; @@ -553,8 +517,6 @@ class SurveyList { echo $lang['srv_gdpr_dpa'].''; echo '
                    • '; - echo '
                  • '; - // Zahteve za izbris echo '
                  • '; $request_counter = GDPR::countUserUnfinishedRequests(); @@ -565,10 +527,7 @@ class SurveyList { echo '
                    • '; // Vse zahteve za izbris - samo ADMINI - if($admin_type == '0'){ - - echo '
                  • '; - + if($admin_type == '0'){ echo '
                  • '; echo ''; @@ -590,8 +549,7 @@ class SurveyList { if ($admin_type == 0) { - echo '
                  • '; - + # Uvozi - samo admini echo '
                  • '; echo ''; echo '
                    • '; - echo '
                  • '; - # Testiranje - samo admini echo '
                  • '; echo ''; echo 'Testiranje'; echo '
                    • '; - - echo '
                  • '; - + # GC - samo admini echo '
                  • '; echo ''; @@ -691,8 +645,8 @@ class SurveyList { echo '
                    '; - echo '
                      '; - echo '
                    1. '; + echo '
                        '; + echo '
                      1. '; echo ''; echo '
                        '. $lang['srv_pregledovanje'] . '
                        '; echo '                        '; @@ -700,9 +654,7 @@ class SurveyList { $SLCountPhoneSurvey = $this->countPhoneSurveys(); if ($SLCountPhoneSurvey > 0 && $admin_type != '0') { - #echo '
                      2.  
                        3. '; - echo '
                      3.  
                        4. '; - echo '
                      4. '; + echo '
                      5. '; echo ''; echo '
                        ' . $lang['srv_telephone_surveys'] . '
                        '; echo '                        '; @@ -712,9 +664,7 @@ class SurveyList { $SLCount = $this->countSurveys(); if ($SLCount > 0 && $admin_type <= 1) { - #echo '
                      6.  
                        7. '; - echo '
                      7.  
                        8. '; - echo '
                      8. '; + echo '
                      9. '; echo ''; echo '
                        '. $lang['srv_diagnostics'] . '
                        '; echo '                        '; @@ -724,47 +674,30 @@ class SurveyList { # uporabniki if ($admin_type <= 1 /*or true*/) { # ni smiselno da ostali uporabniki vidijo zavihek, ker so tako prikazane samo njihove ankete - echo '
                      10.  
                        11. '; - echo '
                      11. '; + echo '
                      12. '; echo ''; echo '
                        '. $lang['hour_users'] . '
                        '; echo '                        '; echo '
                        13. '; } - echo '
                      13.  
                        14. '; - echo '
                      14. '; + + // Knjiznica + echo '
                      15. '; echo ''; echo '
                        '. $lang['srv_library'] . '
                        '; echo '                        '; echo '
                        16. '; - # Nastavitve - //if ($admin_type == 0) { - echo '
                      16.  
                        17. '; - - echo '
                      17. '; - echo ''; - echo '
                        ' . $lang['settings'] . '
                        '; - echo '                        '; - echo '
                        18. '; - //} - - # Streznik - if ($admin_type == 0 && false) { - echo '
                      18.  
                        19. '; - - echo '
                      19. '; - echo ''; - echo '
                        '/*'*/.$lang['srv_sar'].'
                        '; - echo '                        '; - echo '
                        20. '; - } + // Nastavitve + echo '
                      20. '; + echo ''; + echo '
                        ' . $lang['settings'] . '
                        '; + echo '                        '; + echo '
                        21. '; # Obvestila - zaenkrat samo admin if ($admin_type == 0) { - echo '
                      21.  
                        22. '; - - echo '
                      22. '; + echo '
                      23. '; echo ''; echo '
                        '.$lang['srv_notifications'].'
                        '; echo '                        '; @@ -773,9 +706,7 @@ class SurveyList { # Narocila - samo ce imamo vklopljene pakete if(AppSettings::getInstance()->getSetting('app_settings-commercial_packages') === true){ - echo '
                      24.  
                        25. '; - - echo '
                      25. '; + echo '
                      26. '; echo ''; echo '
                        '.$lang['srv_narocila'].'
                        '; echo '                        '; @@ -783,9 +714,7 @@ class SurveyList { } # GDPR - echo '
                      27.  
                        28. '; - - echo '
                      28. '; + echo '
                      29. '; $request_counter = GDPR::countUserUnfinishedRequests(); $request_counter_text = (true) ? ' ('.$request_counter.')' : ''; echo ''; @@ -795,9 +724,7 @@ class SurveyList { # UL evalvacija razne nastavitve, uvozi, izvozi - samo na anketa.uni-lj.si/student (zaenkrat samo admin) if (Common::checkModule('evalvacija') == '1' && $admin_type == 0) { - echo '
                      30.  
                        31. '; - - echo '
                      31. '; + echo '
                      32. '; echo ''; echo '
                        UL evalvacije
                        '; echo '                        '; @@ -833,7 +760,7 @@ class SurveyList { break; } - echo '
                          '; + echo '
                            '; echo '
                          1. '; echo ' '; echo '
                            '.$lang['srv_settings_help'].'
                            '; @@ -3071,23 +2998,31 @@ class SurveyList { $to_update = $meta_surveys_ids; - # poiščemmo katere ankete so OK, in jih odstranimo iz seznama anket potrebnih za update - $stringSurveyList = "SELECT id FROM srv_survey_list WHERE id IN (".implode(',', $meta_surveys_ids).")" - . " AND updated = '0' AND last_updated IS NOT NULL"; - $sqlSurveyList = sisplet_query($stringSurveyList); - while ( $rowSurveyList = mysqli_fetch_assoc($sqlSurveyList)) { - if (isset($to_update[$rowSurveyList['id']])) { - unset($to_update[$rowSurveyList['id']]); - } - } + if(!empty($meta_surveys_ids)){ + + # poiščemmo katere ankete so OK, in jih odstranimo iz seznama anket potrebnih za update + $sqlSurveyList = sisplet_query("SELECT id + FROM srv_survey_list + WHERE id IN (".implode(',', $meta_surveys_ids).") + AND updated = '0' AND last_updated IS NOT NULL + "); + while ( $rowSurveyList = mysqli_fetch_assoc($sqlSurveyList)) { + if (isset($to_update[$rowSurveyList['id']])) { + unset($to_update[$rowSurveyList['id']]); + } + } + } + } else{ $to_update = $this->surveys_ids; # poiščemmo katere ankete so OK, in jih odstranimo iz seznama anket potrebnih za update - $stringSurveyList = "SELECT id FROM srv_survey_list WHERE id IN (".implode(',', $this->surveys_ids).")" - . " AND updated = '0' AND last_updated IS NOT NULL"; - $sqlSurveyList = sisplet_query($stringSurveyList); + $sqlSurveyList = sisplet_query("SELECT id + FROM srv_survey_list + WHERE id IN (".implode(',', $this->surveys_ids).") + AND updated = '0' AND last_updated IS NOT NULL + "); while ( $rowSurveyList = mysqli_fetch_assoc($sqlSurveyList)) { if (isset($to_update[$rowSurveyList['id']])) { unset($to_update[$rowSurveyList['id']]); diff --git a/admin/survey/minify/.php_cs b/admin/survey/minify/.php_cs index 8f257737f..100fea9d8 100644 --- a/admin/survey/minify/.php_cs +++ b/admin/survey/minify/.php_cs @@ -1,27 +1,23 @@ in(__DIR__ . '/lib') -; +$rules = array( + '@PSR2' => true, +); -return Symfony\CS\Config\Config::create() - ->level(Symfony\CS\FixerInterface::PSR2_LEVEL) - ->setUsingCache(true) - ->fixers(array( - 'linefeed', - 'trailing_spaces', - 'unused_use', - 'short_tag', - 'return', - 'visibility', - 'php_closing_tag', - 'extra_empty_lines', - 'function_declaration', - 'include', - 'controls_spaces', - 'elseif', - '-eof_ending', - '-method_argument_space', - )) - ->finder($finder) -; +$config = PhpCsFixer\Config::create(); +$finder = $config->getFinder(); + +$finder + ->in(array('.', 'builder/', 'lib/', 'tests/', 'min_extras/', 'static/')) + ->name('*.php') + ->ignoreDotFiles(true) + ->ignoreVCS(true); + +return $config + ->setUsingCache(true) + ->setRiskyAllowed(true) + ->setRules($rules) + ->setIndent(' ') + ->setLineEnding("\n"); + +// vim:ft=php diff --git a/admin/survey/minify/.semver b/admin/survey/minify/.semver new file mode 100644 index 000000000..cebcb5793 --- /dev/null +++ b/admin/survey/minify/.semver @@ -0,0 +1,6 @@ +--- +:major: 3 +:minor: 0 +:patch: 11 +:special: '' +:metadata: '' diff --git a/admin/survey/minify/.travis.yml b/admin/survey/minify/.travis.yml index 25a5f78c4..967f416c8 100644 --- a/admin/survey/minify/.travis.yml +++ b/admin/survey/minify/.travis.yml @@ -5,7 +5,8 @@ dist: trusty jobs: fast_finish: true allow_failures: - - php: "hhvm" + - php: "nightly" + - name: "Php CS Fixer" include: - php: "5.3" dist: precise @@ -15,8 +16,13 @@ jobs: - php: "7.0" - php: "7.1" - php: "7.2" + - php: "7.3" + - php: "7.4" - php: "nightly" - - php: "hhvm" + - name: "Php CS Fixer" + php: "7.3" + env: + - PHP_CS_FIXER=1 env: - CLOSURE_VERSION: 20161024 @@ -36,7 +42,14 @@ before_script: - tests/dl-closure.sh script: + - PATH=vendor/bin:$PATH - composer validate - - phpunit --verbose + - | + if [ "$PHP_CS_FIXER" ]; then + composer config --unset platform.php + composer require --dev friendsofphp/php-cs-fixer:2.16 + php-cs-fixer fix --verbose --diff --dry-run --ansi + fi + - vendor/bin/phpunit --verbose # vim:ts=2:sw=2:et diff --git a/admin/survey/minify/CHANGELOG.md b/admin/survey/minify/CHANGELOG.md index 59fa3bb49..4acfdcd85 100644 --- a/admin/survey/minify/CHANGELOG.md +++ b/admin/survey/minify/CHANGELOG.md @@ -1,18 +1,101 @@ -## Version 3.0.3 (2017-11-03) +# Changelog -* Fix closure-compiler's error "redirection limit reached". #618, #619 +All notable changes to this project will be documented in this file. -## Version 3.0.2 (2017-09-14) +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), +and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -* Fixes syntax error in Groups controller, #613 -* Better-maintained lessphp fork, #610 -* No longer corrupts some chars in some environments, #608 +## [3.0.11] - 2021-03-11 -## Version 3.0.1 (2017-06-09) +- PHP 8.0 support, [#685], [#682], [#677] -* Update CSSmin to v4, #599, #590 +[3.0.11]: https://github.com/mrclay/minify/compare/3.0.10...3.0.11 +[#685]: https://github.com/mrclay/minify/pull/685 +[#682]: https://github.com/mrclay/minify/pull/682 +[#677]: https://github.com/mrclay/minify/pull/677 + +## [3.0.10] - 2020-04-02 + +- Exclude SSI Comments from HTML minify, [#670], [#671] + +[3.0.10]: https://github.com/mrclay/minify/compare/3.0.9...3.0.10 +[#671]: https://github.com/mrclay/minify/issues/671 +[#670]: https://github.com/mrclay/minify/pull/670 + +## [3.0.9] - 2020-03-24 + +- Allow `intervention/httpauth` 3.x, [#667], [#666], [#664] + +[3.0.9]: https://github.com/mrclay/minify/compare/3.0.8...3.0.9 +[#664]: https://github.com/mrclay/minify/issues/664 +[#666]: https://github.com/mrclay/minify/pull/666 +[#667]: https://github.com/mrclay/minify/pull/667 + +## [3.0.8] - 2020-03-19 + +- Removed deprecated get_magic_quotes_gpc() function that since PHP 5.4.0 returns FALSE always, and since PHP 7.4 is deprecated, [#661] + +[3.0.8]: https://github.com/mrclay/minify/compare/3.0.7...3.0.8 +[#661]: https://github.com/mrclay/minify/pull/661 + +## [3.0.7] - 2019-12-10 + +- Allow mrclay/props-dic ^3.0, [#658] + +[3.0.7]: https://github.com/mrclay/minify/compare/3.0.6...3.0.7 +[#658]: https://github.com/mrclay/minify/pull/658 + +## [3.0.6] - 2019-10-28 + +- Bugfix for option sanitizer, [#654], [#655] + +[3.0.6]: https://github.com/mrclay/minify/compare/3.0.5...3.0.6 +[#654]: https://github.com/mrclay/minify/issues/654 +[#655]: https://github.com/mrclay/minify/pull/655 + +## [3.0.5] - 2019-10-01 + +- Fix syntax error in composer.json, [#653] + +[3.0.5]: https://github.com/mrclay/minify/compare/3.0.4...3.0.5 +[#653]: https://github.com/mrclay/minify/pull/653 + +## 3.0.4 - 2019-09-24 + +- Fix PHP 7.3 compatibility issues, [#648] + +[3.0.4]: https://github.com/mrclay/minify/compare/3.0.3...3.0.4 +[#648]: https://github.com/mrclay/minify/issues/648 + +## [3.0.3] - 2017-11-03 + +- Fix closure-compiler's error "redirection limit reached". [#618], [#619] + +[3.0.3]: https://github.com/mrclay/minify/compare/3.0.2...3.0.3 +[#618]: https://github.com/mrclay/minify/pull/618 +[#619]: https://github.com/mrclay/minify/issues/619 + +## [3.0.2] - 2017-09-14 + +- Fixes syntax error in Groups controller, [#613] +- Better-maintained lessphp fork, [#610] +- No longer corrupts some chars in some environments, [#608] + +[3.0.2]: https://github.com/mrclay/minify/compare/3.0.1...3.0.2 +[#608]: https://github.com/mrclay/minify/pull/608 +[#610]: https://github.com/mrclay/minify/pull/610 +[#613]: https://github.com/mrclay/minify/issues/613 + +## [3.0.1] - 2017-06-09 + +- Update CSSmin to v4, [#599], [#590] + +[3.0.1]: https://github.com/mrclay/minify/compare/3.0.0...3.0.1 +[#590]: https://github.com/mrclay/minify/issues/590 +[#599]: https://github.com/mrclay/minify/pull/599 + +## 3.0.0 - 2017-04-03 -## Version 3.0.0 (2017-04-03) * Improved CSS minification via Túbal Martín's CSSMin * Easier error identification (just see error_log) * Adds feature to serve static files directly @@ -30,7 +113,8 @@ * BREAKING: Removes `$min_libPath` option * BREAKING: The Minify, source, and controller components have changed APIs -## Version 2.3.0 (2016-03-11) +## 2.3.0 - 2016-03-11 + * Adds `$min_concatOnly` option to just concatenate files * Deprecates use of Minify_Loader * Deprecates use of Minify_Logger @@ -38,13 +122,15 @@ * Deprecates use of FirePHP * Deprecates use of DooDigestAuth -## Version 2.2.1 (2014-10-30) +## 2.2.1 - 2014-10-30 + * Builder styled with Bootstrap (thanks to help from acidvertigo) * Update CSSmin to v.2.4.8 * Added WinCache * URLs with spaces properly rewritten -## Version 2.2.0 (2014-03-12) +## 2.2.0 - 2014-03-12 + * Fix handling of RegEx in certain situations in JSMin * Thanks to Vovan-VE for reporting this * Update composer.json with support info @@ -66,11 +152,13 @@ * Allow far-future expiration and file versioning with the "v" querystirng parameter in addition to existing method * Lots of general code tidy ups -## Version 2.1.7 (2013-07-23) +## 2.1.7 - 2013-07-23 + * Fixes arbitrary file inclusion vulnerability on some systems * Thanks to Matt Mecham for reporting this -## Version 2.1.6 (2013-07-19) +## 2.1.6 - 2013-07-19 + * JSMin fixes * Prevents some Closure Compiler API failures * Uses autoloading for all class loading @@ -82,7 +170,8 @@ * CLI script more portable * Adds composer.json -## Version 2.1.5 (2012-03-10) +## 2.1.5 - 2012-03-10 + * Removed XSS vulnerability * Disabled builder by default * command line tools to minify and rewrite URIs in CSS @@ -91,7 +180,8 @@ * Closure Compiler uses cURL when allow\_url\_fopen is off * Missing file notices when using groups -## Version 2.1.4b (2010-07-10) +## 2.1.4b - 2010-07-10 + * Option to minify JS with Closure Compiler API w/ JSMin failover * Cookie/bookmarklet-based debug mode. No HTML editing! * Allows 1 file to be missing w/o complete failure @@ -107,7 +197,8 @@ * Removed annoying maxFiles limit * mbstring.func\_overload usage is safer -## Version 2.1.3 (2009-06-30) +## 2.1.3 - 2009-06-30 + * CSS fixes * A few URI rewriting bugs fixed * comment/whitespace removal no longer breaks some values @@ -122,7 +213,8 @@ * API: Can set contentType Minify\_Source objects (fixes an annoying [caveat](http://groups.google.com/group/minify/msg/8446d32ee99a4961)) * [Resolved Issue list](http://code.google.com/p/minify/issues/list?can=1&q=label%3ARelease-2.1.2%20status%3AVerified) -## Version 2.1.2 (2009-03-04) +## 2.1.2 - 2009-03-04 + * Javascript fixes * Debug mode no longer confused by `*/*` in strings/RegExps (jQuery) * quote characters inside RegExp literals no longer cause exception @@ -134,14 +226,16 @@ * Builder app doesn't fail on systems without gzdeflate() * APC caching class included -## Version 2.1.1 (2008-10-19) +## 2.1.1 - 2008-10-19 + * Bug fix release * Detection and workarounds for zlib.output\_compression and non-PHP encoding modules * Zlib not required (mod\_rewrite, et.al., can still be used for encoding) * HTML : More IE conditional comments preserved * Minify\_groupUri() utility fixed -## Version 2.1.0 (2008-09-18) +## 2.1.0 - 2008-09-18 + * "min" default application for quick deployment * Minify URI Builder app & bookmarklet for quickly creating minify URIs * Relative URIs in CSS file are fixed automatically by default @@ -157,8 +251,8 @@ * Minify\_Cache\_File has flock()s (by default) * Workaround for Windows mtime reporting bug +## 2.0.0 - 2008-05-22 -## Version 2.0.0 (2008-05-22) * Complete code overhaul. Minify is now a PEAR-style class and toolkit for building customized minifying file servers. * Content-Encoding: deflate/gzip/compress, based on request headers * Expanded CSS and HTML minifiers with test cases @@ -167,10 +261,12 @@ * Compression & encoding modules lazy-loaded as needed (304 responses use minimal code) * Separate utility classes for HTTP encoding and cache control -## Version 1.0.1 (2007-05-05) +## 1.0.1 - 2007-05-05 + * Fixed various problems resolving pathnames when hosted on an NFS mount. * Fixed 'undefined constant' notice. * Replaced old JSMin library with a much faster custom implementation. -## Version 1.0.0 (2007-05-02) +## 1.0.0 - 2007-05-02 + * First release. diff --git a/admin/survey/minify/bootstrap.php b/admin/survey/minify/bootstrap.php index 9ad57ec20..d2bdbef93 100644 --- a/admin/survey/minify/bootstrap.php +++ b/admin/survey/minify/bootstrap.php @@ -25,4 +25,4 @@ call_user_func(function () { require $file; }); -return new \Minify\App(__DIR__); +return new \Minify\App(__DIR__); \ No newline at end of file diff --git a/admin/survey/minify/builder/.htaccess b/admin/survey/minify/builder/.htaccess new file mode 100644 index 000000000..53cac3b13 --- /dev/null +++ b/admin/survey/minify/builder/.htaccess @@ -0,0 +1,4 @@ + +RewriteEngine on +RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization},L] + \ No newline at end of file diff --git a/admin/survey/minify/builder/_index.js b/admin/survey/minify/builder/_index.js index 0b6a80c53..ef30568cf 100644 --- a/admin/survey/minify/builder/_index.js +++ b/admin/survey/minify/builder/_index.js @@ -162,12 +162,12 @@ var MUB = { ext = thisExt; else if (thisExt !== ext) { fail = true; - return genericAlertPopup('alert_extensions_match'); + return alert('extensions must match!'); } this.value = this.value.replace(/^\//, ''); if (-1 !== $.inArray(this.value, sources)) { fail = true; - return genericAlertPopup('alert_duplicate_file'); + return alert('duplicate file!'); } sources.push(this.value); } diff --git a/admin/survey/minify/builder/bm.js b/admin/survey/minify/builder/bm.js index 16f552f1b..e04569f69 100644 --- a/admin/survey/minify/builder/bm.js +++ b/admin/survey/minify/builder/bm.js @@ -32,5 +32,7 @@ javascript:(function() { if (uris.length) window.open('%BUILDER_URL%#' + uris.join(',')); else - genericAlertPopup('alert_no_jscss_found',home.split('/')[2]); + alert('No js/css files found with URLs within "' + + home.split('/')[2] + + '".\n(This tool is limited to URLs with the same domain.)'); })(); \ No newline at end of file diff --git a/admin/survey/minify/builder/index.php b/admin/survey/minify/builder/index.php index 9cb8c1a60..d4ea38c1f 100644 --- a/admin/survey/minify/builder/index.php +++ b/admin/survey/minify/builder/index.php @@ -1,4 +1,4 @@ -env->get('hello')) { )); $he->encode(); $he->sendAll(); - } else { // echo status "0" or "1" header('Content-Type: text/plain'); diff --git a/admin/survey/minify/builder/test.php b/admin/survey/minify/builder/test.php index 88e8da056..c139ec602 100644 --- a/admin/survey/minify/builder/test.php +++ b/admin/survey/minify/builder/test.php @@ -37,7 +37,7 @@ if (isset($_GET['oc'])) { echo "

                            \$_SERVER['SUBDOMAIN_DOCUMENT_ROOT'] is set. " . "You may need to set \$min_documentRoot to this in config.php

                            "; } - + } -//*/ \ No newline at end of file +//*/ diff --git a/admin/survey/minify/composer.json b/admin/survey/minify/composer.json index 651f1f880..2fb1af242 100644 --- a/admin/survey/minify/composer.json +++ b/admin/survey/minify/composer.json @@ -1,7 +1,7 @@ { "name": "mrclay/minify", "type": "library", - "description": "Minify is a PHP5 app that helps you follow several rules for client-side performance. It combines multiple CSS or Javascript files, removes unnecessary whitespace and comments, and serves them with gzip encoding and optimal client-side cache headers", + "description": "Minify is a PHP app that helps you follow several rules for client-side performance. It combines multiple CSS or Javascript files, removes unnecessary whitespace and comments, and serves them with gzip encoding and optimal client-side cache headers", "homepage": "https://github.com/mrclay/minify", "license": "BSD-3-Clause", "authors": [ @@ -22,26 +22,31 @@ "autoload-dev": { "psr-4": {"Minify\\Test\\": "tests/"} }, + "config": { + "platform": { + "php": "5.3.29" + }, + "sort-packages": true + }, "require": { + "php": "^5.3.0 || ^7.0 || ^8.0", "ext-pcre": "*", - "intervention/httpauth": "~2.0", - "monolog/monolog": "~1.1", + "intervention/httpauth": "^2.0|^3.0", + "marcusschwarz/lesserphp": "^0.5.1", + "monolog/monolog": "~1.1|~2.0", "mrclay/jsmin-php": "~2", - "mrclay/props-dic": "^2.2", - "php": "^5.3.0 || ^7.0", + "mrclay/props-dic": "^2.2|^3.0", "tubalmartin/cssmin": "~4" }, "require-dev": { "firephp/firephp-core": "~0.4.0", "leafo/scssphp": "^0.3 || ^0.6 || ^0.7", - "marcusschwarz/lesserphp": "~0.5.1", "meenie/javascript-packer": "~1.1", "phpunit/phpunit": "^4.8.36", "tedivm/jshrink": "~1.1.0" }, "suggest": { "firephp/firephp-core": "Use FirePHP for Log messages", - "marcusschwarz/lesserphp": "LESS support", "meenie/javascript-packer": "Keep track of the Packer PHP port using Composer" }, "scripts": { diff --git a/admin/survey/minify/config-test.php b/admin/survey/minify/config-test.php index 7524a3d11..8b903a549 100644 --- a/admin/survey/minify/config-test.php +++ b/admin/survey/minify/config-test.php @@ -4,7 +4,6 @@ * * To test config options, place them in this file and add "&test" to your Minify URL. * Note that if this is on a public server, anyone can execute your test. - * + * * @package Minify */ - diff --git a/admin/survey/minify/index.php b/admin/survey/minify/index.php index 7b58bcc7e..e3fea30c1 100644 --- a/admin/survey/minify/index.php +++ b/admin/survey/minify/index.php @@ -1,9 +1,9 @@ _stripEtag = true; - $this->_headers['Vary'] = 'Accept-Encoding'; if ('' !== $spec['encoding']) { + $this->_headers['Vary'] = 'Accept-Encoding'; if (0 === strpos($spec['encoding'], 'x-')) { $spec['encoding'] = substr($spec['encoding'], 2); } @@ -317,7 +317,7 @@ class HTTP_ConditionalGet if (!isset($_SERVER['HTTP_IF_NONE_MATCH'])) { return false; } - $clientEtagList = get_magic_quotes_gpc() + $clientEtagList = PHP_VERSION_ID < 50400 && get_magic_quotes_gpc() ? stripslashes($_SERVER['HTTP_IF_NONE_MATCH']) : $_SERVER['HTTP_IF_NONE_MATCH']; $clientEtags = explode(',', $clientEtagList); diff --git a/admin/survey/minify/lib/HTTP/Encoder.php b/admin/survey/minify/lib/HTTP/Encoder.php index 3bd788cc7..46de1b688 100644 --- a/admin/survey/minify/lib/HTTP/Encoder.php +++ b/admin/survey/minify/lib/HTTP/Encoder.php @@ -204,9 +204,10 @@ class HTTP_Encoder } // gzip checks (slow) if (preg_match( - '@(?:^|,)\\s*((?:x-)?gzip)\\s*(?:$|,|;\\s*q=(?:0\\.|1))@' - ,$ae - ,$m)) { + '@(?:^|,)\\s*((?:x-)?gzip)\\s*(?:$|,|;\\s*q=(?:0\\.|1))@', + $ae, + $m + )) { return array('gzip', $m[1]); } if ($allowDeflate) { @@ -217,14 +218,17 @@ class HTTP_Encoder || 0 === strpos($ae, 'deflate,') // opera // slow parsing || preg_match( - '@(?:^|,)\\s*deflate\\s*(?:$|,|;\\s*q=(?:0\\.|1))@', $ae)) { + '@(?:^|,)\\s*deflate\\s*(?:$|,|;\\s*q=(?:0\\.|1))@', + $ae + )) { return array('deflate', 'deflate'); } } if ($allowCompress && preg_match( - '@(?:^|,)\\s*((?:x-)?compress)\\s*(?:$|,|;\\s*q=(?:0\\.|1))@' - ,$ae - ,$m)) { + '@(?:^|,)\\s*((?:x-)?compress)\\s*(?:$|,|;\\s*q=(?:0\\.|1))@', + $ae, + $m + )) { return array('compress', $m[1]); } diff --git a/admin/survey/minify/lib/Minify.php b/admin/survey/minify/lib/Minify.php index c41871dd3..d0aafda30 100644 --- a/admin/survey/minify/lib/Minify.php +++ b/admin/survey/minify/lib/Minify.php @@ -242,7 +242,7 @@ class Minify if (! $this->options['quiet']) { $this->errorExit($this->options['badRequestHeader'], self::URL_DEBUG); } else { - list(,$statusCode) = explode(' ', $this->options['badRequestHeader']); + list(, $statusCode) = explode(' ', $this->options['badRequestHeader']); return array( 'success' => false, @@ -470,7 +470,7 @@ class Minify public function errorExit($header, $url = '', $msgHtml = '') { $url = htmlspecialchars($url, ENT_QUOTES); - list(,$h1) = explode(' ', $header, 2); + list(, $h1) = explode(' ', $header, 2); $h1 = htmlspecialchars($h1); // FastCGI environments require 3rd arg to header() to be set list(, $code) = explode(' ', $header, 3); @@ -593,7 +593,8 @@ class Minify ! $source // yes, we ran out of sources || $type === self::TYPE_CSS // yes, to process CSS individually (avoiding PCRE bugs/limits) || $minifier !== $lastMinifier // yes, minifier changed - || $options !== $lastOptions)) { // yes, options changed + || $options !== $lastOptions // yes, options changed + )) { // minify previous sources with last settings $imploded = implode($implodeSeparator, $groupToProcessTogether); $groupToProcessTogether = array(); diff --git a/admin/survey/minify/lib/Minify/App.php b/admin/survey/minify/lib/Minify/App.php index 271444110..4ed15a60d 100644 --- a/admin/survey/minify/lib/Minify/App.php +++ b/admin/survey/minify/lib/Minify/App.php @@ -80,6 +80,12 @@ class App extends Container }; $varNames = array_map($prefixer, $propNames); + $varDefined = get_defined_vars(); + + $varNames = array_filter($varNames, function ($name) use ($varDefined) { + return array_key_exists($name, $varDefined); + }); + $vars = compact($varNames); foreach ($varNames as $varName) { diff --git a/admin/survey/minify/lib/Minify/CSSmin.php b/admin/survey/minify/lib/Minify/CSSmin.php index 753c51091..0003f735e 100644 --- a/admin/survey/minify/lib/Minify/CSSmin.php +++ b/admin/survey/minify/lib/Minify/CSSmin.php @@ -73,16 +73,16 @@ class Minify_CSSmin } if ($options['currentDir']) { return Minify_CSS_UriRewriter::rewrite( - $css - ,$options['currentDir'] - ,$options['docRoot'] - ,$options['symlinks'] + $css, + $options['currentDir'], + $options['docRoot'], + $options['symlinks'] ); } return Minify_CSS_UriRewriter::prepend( - $css - ,$options['prependRelativePath'] + $css, + $options['prependRelativePath'] ); } } diff --git a/admin/survey/minify/lib/Minify/Cache/Null.php b/admin/survey/minify/lib/Minify/Cache/Null.php index 4f654a6cd..165043ee3 100644 --- a/admin/survey/minify/lib/Minify/Cache/Null.php +++ b/admin/survey/minify/lib/Minify/Cache/Null.php @@ -64,4 +64,4 @@ class Minify_Cache_Null implements Minify_CacheInterface public function fetch($id) { } -} \ No newline at end of file +} diff --git a/admin/survey/minify/lib/Minify/Cache/WinCache.php b/admin/survey/minify/lib/Minify/Cache/WinCache.php index 46e285a72..3dd1c40f8 100644 --- a/admin/survey/minify/lib/Minify/Cache/WinCache.php +++ b/admin/survey/minify/lib/Minify/Cache/WinCache.php @@ -136,4 +136,4 @@ class Minify_Cache_WinCache implements Minify_CacheInterface return true; } -} \ No newline at end of file +} diff --git a/admin/survey/minify/lib/Minify/Controller/Files.php b/admin/survey/minify/lib/Minify/Controller/Files.php index 85a76d0eb..7d517f4df 100644 --- a/admin/survey/minify/lib/Minify/Controller/Files.php +++ b/admin/survey/minify/lib/Minify/Controller/Files.php @@ -68,4 +68,3 @@ class Minify_Controller_Files extends Minify_Controller_Base return new Minify_ServeConfiguration($options, $sources); } } - diff --git a/admin/survey/minify/lib/Minify/Controller/Groups.php b/admin/survey/minify/lib/Minify/Controller/Groups.php index af8af336d..d3813f2cd 100644 --- a/admin/survey/minify/lib/Minify/Controller/Groups.php +++ b/admin/survey/minify/lib/Minify/Controller/Groups.php @@ -73,4 +73,3 @@ class Minify_Controller_Groups extends Minify_Controller_Files return parent::createConfiguration($options); } } - diff --git a/admin/survey/minify/lib/Minify/Controller/Page.php b/admin/survey/minify/lib/Minify/Controller/Page.php index 7001fe0ef..ca2778c91 100644 --- a/admin/survey/minify/lib/Minify/Controller/Page.php +++ b/admin/survey/minify/lib/Minify/Controller/Page.php @@ -66,4 +66,3 @@ class Minify_Controller_Page extends Minify_Controller_Base return new Minify_ServeConfiguration($options, $sources, $selectionId); } } - diff --git a/admin/survey/minify/lib/Minify/ControllerInterface.php b/admin/survey/minify/lib/Minify/ControllerInterface.php index 35b4de3f4..1527ff6c8 100644 --- a/admin/survey/minify/lib/Minify/ControllerInterface.php +++ b/admin/survey/minify/lib/Minify/ControllerInterface.php @@ -19,4 +19,4 @@ interface Minify_ControllerInterface * @return Minify_Env */ public function getEnv(); -} \ No newline at end of file +} diff --git a/admin/survey/minify/lib/Minify/HTML.php b/admin/survey/minify/lib/Minify/HTML.php index df648e12f..ef98b3866 100644 --- a/admin/survey/minify/lib/Minify/HTML.php +++ b/admin/survey/minify/lib/Minify/HTML.php @@ -99,32 +99,34 @@ class Minify_HTML // replace SCRIPTs (and minify) with placeholders $this->_html = preg_replace_callback( - '/(\\s*)]*?>)([\\s\\S]*?)<\\/script>(\\s*)/iu' - ,array($this, '_removeScriptCB') - ,$this->_html); + '/(\\s*)]*?>)([\\s\\S]*?)<\\/script>(\\s*)/iu', + array($this, '_removeScriptCB'), + $this->_html + ); // replace STYLEs (and minify) with placeholders $this->_html = preg_replace_callback( - '/\\s*]*>)([\\s\\S]*?)<\\/style>\\s*/iu' - ,array($this, '_removeStyleCB') - ,$this->_html); + '/\\s*]*>)([\\s\\S]*?)<\\/style>\\s*/iu', + array($this, '_removeStyleCB'), + $this->_html + ); // remove HTML comments (not containing IE conditional comments). $this->_html = preg_replace_callback( - '//u' - ,array($this, '_commentCB') - ,$this->_html); + '//u', + array($this, '_commentCB'), + $this->_html + ); // replace PREs with placeholders - $this->_html = preg_replace_callback('/\\s*]*?>[\\s\\S]*?<\\/pre>)\\s*/iu' - ,array($this, '_removePreCB') - ,$this->_html); + $this->_html = preg_replace_callback('/\\s*]*?>[\\s\\S]*?<\\/pre>)\\s*/iu', array($this, '_removePreCB'), $this->_html); // replace TEXTAREAs with placeholders $this->_html = preg_replace_callback( - '/\\s*]*?>[\\s\\S]*?<\\/textarea>)\\s*/iu' - ,array($this, '_removeTextareaCB') - ,$this->_html); + '/\\s*]*?>[\\s\\S]*?<\\/textarea>)\\s*/iu', + array($this, '_removeTextareaCB'), + $this->_html + ); // trim each line. // @todo take into account attribute values that span multiple lines. @@ -139,24 +141,25 @@ class Minify_HTML // remove ws outside of all elements $this->_html = preg_replace( - '/>(\\s(?:\\s*))?([^<]+)(\\s(?:\s*))?$1$2$3<' - ,$this->_html); + '/>(\\s(?:\\s*))?([^<]+)(\\s(?:\s*))?$1$2$3<', + $this->_html + ); // use newlines before 1st attribute in open tags (to limit line lengths) $this->_html = preg_replace('/(<[a-z\\-]+)\\s+([^>]+>)/iu', "$1\n$2", $this->_html); // fill placeholders $this->_html = str_replace( - array_keys($this->_placeholders) - ,array_values($this->_placeholders) - ,$this->_html + array_keys($this->_placeholders), + array_values($this->_placeholders), + $this->_html ); // issue 229: multi-pass to catch scripts that didn't get replaced in textareas $this->_html = str_replace( - array_keys($this->_placeholders) - ,array_values($this->_placeholders) - ,$this->_html + array_keys($this->_placeholders), + array_values($this->_placeholders), + $this->_html ); return $this->_html; @@ -164,7 +167,7 @@ class Minify_HTML protected function _commentCB($m) { - return (0 === strpos($m[1], '[') || false !== strpos($m[1], '_reservePlace($this->_needsCdata($css) + return $this->_reservePlace( + $this->_needsCdata($css) ? "{$openStyle}/**/" : "{$openStyle}{$css}" ); @@ -238,7 +242,8 @@ class Minify_HTML : 'trim'; $js = call_user_func($minifier, $js); - return $this->_reservePlace($this->_needsCdata($js) + return $this->_reservePlace( + $this->_needsCdata($js) ? "{$ws1}{$openScript}/**/{$ws2}" : "{$ws1}{$openScript}{$js}{$ws2}" ); diff --git a/admin/survey/minify/lib/Minify/ImportProcessor.php b/admin/survey/minify/lib/Minify/ImportProcessor.php index 85d9ff51e..00e413b31 100644 --- a/admin/survey/minify/lib/Minify/ImportProcessor.php +++ b/admin/survey/minify/lib/Minify/ImportProcessor.php @@ -66,7 +66,7 @@ class Minify_ImportProcessor $this->_currentDir = dirname($file); // remove UTF-8 BOM if present - if (pack("CCC",0xef,0xbb,0xbf) === substr($content, 0, 3)) { + if (pack("CCC", 0xef, 0xbb, 0xbf) === substr($content, 0, 3)) { $content = substr($content, 3); } // ensure uniform EOLs @@ -182,7 +182,7 @@ class Minify_ImportProcessor private function truepath($path) { // whether $path is unix or not - $unipath = ('' === $path) || ($path{0} !== '/'); + $unipath = ('' === $path) || ($path[0] !== '/'); // attempts to detect if path is relative in which case, add cwd if (strpos($path, ':') === false && $unipath) { diff --git a/admin/survey/minify/lib/Minify/JS/ClosureCompiler.php b/admin/survey/minify/lib/Minify/JS/ClosureCompiler.php index b84262208..191903518 100644 --- a/admin/survey/minify/lib/Minify/JS/ClosureCompiler.php +++ b/admin/survey/minify/lib/Minify/JS/ClosureCompiler.php @@ -195,13 +195,13 @@ class Minify_JS_ClosureCompiler curl_close($ch); } else { throw new Minify_JS_ClosureCompiler_Exception( - "Could not make HTTP request: allow_url_open is false and cURL not available" + "Could not make HTTP request: allow_url_open is false and cURL not available" ); } if (false === $contents) { throw new Minify_JS_ClosureCompiler_Exception( - "No HTTP response from server" + "No HTTP response from server" ); } diff --git a/admin/survey/minify/lib/Minify/NailgunClosureCompiler.php b/admin/survey/minify/lib/Minify/NailgunClosureCompiler.php index bdc49da8c..8ce45200c 100644 --- a/admin/survey/minify/lib/Minify/NailgunClosureCompiler.php +++ b/admin/survey/minify/lib/Minify/NailgunClosureCompiler.php @@ -110,4 +110,4 @@ class Minify_NailgunClosureCompiler extends Minify_ClosureCompiler $this->shell("$serverCommand /dev/null 2>/dev/null & sleep 10"); } -} \ No newline at end of file +} diff --git a/admin/survey/minify/lib/Minify/Source/Factory.php b/admin/survey/minify/lib/Minify/Source/Factory.php index f36d1b25c..3e6e378c0 100644 --- a/admin/survey/minify/lib/Minify/Source/Factory.php +++ b/admin/survey/minify/lib/Minify/Source/Factory.php @@ -170,7 +170,7 @@ class Minify_Source_Factory if ($this->options['noMinPattern'] && preg_match($this->options['noMinPattern'], $basename)) { if (preg_match('~\.(css|less)$~i', $basename)) { $spec['minifyOptions']['compress'] = false; - // we still want URI rewriting to work for CSS + // we still want URI rewriting to work for CSS } else { $spec['minifier'] = 'Minify::nullMinifier'; } diff --git a/admin/survey/minify/lib/Minify/YUICompressor.php b/admin/survey/minify/lib/Minify/YUICompressor.php index a45f57230..47723fc93 100644 --- a/admin/survey/minify/lib/Minify/YUICompressor.php +++ b/admin/survey/minify/lib/Minify/YUICompressor.php @@ -154,4 +154,3 @@ class Minify_YUICompressor } } } - diff --git a/admin/survey/minify/lib/MrClay/Cli.php b/admin/survey/minify/lib/MrClay/Cli.php index e9ef3b3bc..fc736abe2 100644 --- a/admin/survey/minify/lib/MrClay/Cli.php +++ b/admin/survey/minify/lib/MrClay/Cli.php @@ -390,4 +390,3 @@ class Cli $this->errors[$letter][] = sprintf($msg, $value); } } - diff --git a/admin/survey/minify/phpunit.xml b/admin/survey/minify/phpunit.xml index b6c77a566..3c54e248b 100644 --- a/admin/survey/minify/phpunit.xml +++ b/admin/survey/minify/phpunit.xml @@ -1,6 +1,6 @@ - + @@ -32,6 +31,7 @@ . tests + vendor diff --git a/admin/survey/minify/server-info.php b/admin/survey/minify/server-info.php index e0c6af871..e6369c28c 100644 --- a/admin/survey/minify/server-info.php +++ b/admin/survey/minify/server-info.php @@ -13,7 +13,8 @@ if (!$enabled) { die('Set $enabled to true to see server info.'); } -function assertTrue($test, $message) { +function assertTrue($test, $message) +{ if (!$test) { echo "Warning: $message\n"; } diff --git a/admin/survey/minify/static/gen.php b/admin/survey/minify/static/gen.php index f07aac21f..c39cefae7 100644 --- a/admin/survey/minify/static/gen.php +++ b/admin/survey/minify/static/gen.php @@ -7,12 +7,12 @@ if (is_file(__DIR__ . '/bootstrap.php')) { $bootstrap_file = __DIR__ . '/../bootstrap.php'; } -$send_400 = function($content = 'Bad URL') { +$send_400 = function ($content = 'Bad URL') { http_response_code(400); die($content); }; -$send_301 = function($url) { +$send_301 = function ($url) { http_response_code(301); header("Cache-Control: max-age=31536000"); header("Location: $url"); diff --git a/admin/survey/minify/static/lib.php b/admin/survey/minify/static/lib.php index 665bc1311..864e0f770 100644 --- a/admin/survey/minify/static/lib.php +++ b/admin/survey/minify/static/lib.php @@ -10,7 +10,8 @@ namespace Minify\StaticService; * @param string $type "css" or "js" * @return string */ -function build_uri($static_uri, $query, $type) { +function build_uri($static_uri, $query, $type) +{ $static_uri = rtrim($static_uri, '/'); $query = ltrim($query, '?'); @@ -30,7 +31,8 @@ function build_uri($static_uri, $query, $type) { * @param bool $auto_create Automatically create the directory if missing? * @return null|string null if missing or can't create */ -function get_cache_time($auto_create = true) { +function get_cache_time($auto_create = true) +{ foreach (scandir(__DIR__) as $entry) { if (ctype_digit($entry)) { return $entry; @@ -50,14 +52,16 @@ function get_cache_time($auto_create = true) { return $time; } -function flush_cache() { +function flush_cache() +{ $time = get_cache_time(false); if ($time) { remove_tree(__DIR__ . "/$time"); } } -function remove_tree($dir) { +function remove_tree($dir) +{ $files = array_diff(scandir($dir), array('.', '..')); foreach ($files as $file) { diff --git a/admin/survey/minify/utils.php b/admin/survey/minify/utils.php index 46e29d768..dddffab0c 100644 --- a/admin/survey/minify/utils.php +++ b/admin/survey/minify/utils.php @@ -48,7 +48,7 @@ function Minify_getUri($keyOrFiles, $opts = array()) * * Since this makes a bunch of stat() calls, you might not want to check this * on every request. - * + * * @param array $keysAndFiles group keys and/or file paths/URIs. * @return int latest modification time of all given keys/files */ diff --git a/composer.lock b/composer.lock index c77f1c246..5a1df5bca 100644 --- a/composer.lock +++ b/composer.lock @@ -8,16 +8,16 @@ "packages": [ { "name": "composer/ca-bundle", - "version": "1.2.10", + "version": "1.3.1", "source": { "type": "git", "url": "https://github.com/composer/ca-bundle.git", - "reference": "9fdb22c2e97a614657716178093cd1da90a64aa8" + "reference": "4c679186f2aca4ab6a0f1b0b9cf9252decb44d0b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/ca-bundle/zipball/9fdb22c2e97a614657716178093cd1da90a64aa8", - "reference": "9fdb22c2e97a614657716178093cd1da90a64aa8", + "url": "https://api.github.com/repos/composer/ca-bundle/zipball/4c679186f2aca4ab6a0f1b0b9cf9252decb44d0b", + "reference": "4c679186f2aca4ab6a0f1b0b9cf9252decb44d0b", "shasum": "" }, "require": { @@ -29,7 +29,7 @@ "phpstan/phpstan": "^0.12.55", "psr/log": "^1.0", "symfony/phpunit-bridge": "^4.2 || ^5", - "symfony/process": "^2.5 || ^3.0 || ^4.0 || ^5.0" + "symfony/process": "^2.5 || ^3.0 || ^4.0 || ^5.0 || ^6.0" }, "type": "library", "extra": { @@ -64,7 +64,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/ca-bundle/issues", - "source": "https://github.com/composer/ca-bundle/tree/1.2.10" + "source": "https://github.com/composer/ca-bundle/tree/1.3.1" }, "funding": [ { @@ -80,7 +80,7 @@ "type": "tidelift" } ], - "time": "2021-06-07T13:58:28+00:00" + "time": "2021-10-28T20:44:15+00:00" }, { "name": "fgrosse/phpasn1", @@ -159,16 +159,16 @@ }, { "name": "geoip2/geoip2", - "version": "v2.11.0", + "version": "v2.12.2", "source": { "type": "git", "url": "https://github.com/maxmind/GeoIP2-php.git", - "reference": "d01be5894a5c1a3381c58c9b1795cd07f96c30f7" + "reference": "83adb44ac4b9553d36b579a14673ed124583082f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/maxmind/GeoIP2-php/zipball/d01be5894a5c1a3381c58c9b1795cd07f96c30f7", - "reference": "d01be5894a5c1a3381c58c9b1795cd07f96c30f7", + "url": "https://api.github.com/repos/maxmind/GeoIP2-php/zipball/83adb44ac4b9553d36b579a14673ed124583082f", + "reference": "83adb44ac4b9553d36b579a14673ed124583082f", "shasum": "" }, "require": { @@ -178,7 +178,8 @@ "php": ">=7.2" }, "require-dev": { - "friendsofphp/php-cs-fixer": "2.*", + "friendsofphp/php-cs-fixer": "3.*", + "phpstan/phpstan": "*", "phpunit/phpunit": "^8.0 || ^9.0", "squizlabs/php_codesniffer": "3.*" }, @@ -210,9 +211,9 @@ ], "support": { "issues": "https://github.com/maxmind/GeoIP2-php/issues", - "source": "https://github.com/maxmind/GeoIP2-php/tree/v2.11.0" + "source": "https://github.com/maxmind/GeoIP2-php/tree/v2.12.2" }, - "time": "2020-10-01T18:48:34+00:00" + "time": "2021-11-30T18:15:25+00:00" }, { "name": "guzzlehttp/guzzle", @@ -287,16 +288,16 @@ }, { "name": "guzzlehttp/promises", - "version": "1.4.1", + "version": "1.5.1", "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "8e7d04f1f6450fef59366c399cfad4b9383aa30d" + "reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/8e7d04f1f6450fef59366c399cfad4b9383aa30d", - "reference": "8e7d04f1f6450fef59366c399cfad4b9383aa30d", + "url": "https://api.github.com/repos/guzzle/promises/zipball/fe752aedc9fd8fcca3fe7ad05d419d32998a06da", + "reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da", "shasum": "" }, "require": { @@ -308,7 +309,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4-dev" + "dev-master": "1.5-dev" } }, "autoload": { @@ -324,10 +325,25 @@ "MIT" ], "authors": [ + { + "name": "Graham Campbell", + "email": "hello@gjcampbell.co.uk", + "homepage": "https://github.com/GrahamCampbell" + }, { "name": "Michael Dowling", "email": "mtdowling@gmail.com", "homepage": "https://github.com/mtdowling" + }, + { + "name": "Tobias Nyholm", + "email": "tobias.nyholm@gmail.com", + "homepage": "https://github.com/Nyholm" + }, + { + "name": "Tobias Schultze", + "email": "webmaster@tubo-world.de", + "homepage": "https://github.com/Tobion" } ], "description": "Guzzle promises library", @@ -336,22 +352,36 @@ ], "support": { "issues": "https://github.com/guzzle/promises/issues", - "source": "https://github.com/guzzle/promises/tree/1.4.1" + "source": "https://github.com/guzzle/promises/tree/1.5.1" }, - "time": "2021-03-07T09:25:29+00:00" + "funding": [ + { + "url": "https://github.com/GrahamCampbell", + "type": "github" + }, + { + "url": "https://github.com/Nyholm", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/promises", + "type": "tidelift" + } + ], + "time": "2021-10-22T20:56:57+00:00" }, { "name": "guzzlehttp/psr7", - "version": "1.8.2", + "version": "1.8.3", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "dc960a912984efb74d0a90222870c72c87f10c91" + "reference": "1afdd860a2566ed3c2b0b4a3de6e23434a79ec85" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/dc960a912984efb74d0a90222870c72c87f10c91", - "reference": "dc960a912984efb74d0a90222870c72c87f10c91", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/1afdd860a2566ed3c2b0b4a3de6e23434a79ec85", + "reference": "1afdd860a2566ed3c2b0b4a3de6e23434a79ec85", "shasum": "" }, "require": { @@ -388,13 +418,34 @@ "MIT" ], "authors": [ + { + "name": "Graham Campbell", + "email": "hello@gjcampbell.co.uk", + "homepage": "https://github.com/GrahamCampbell" + }, { "name": "Michael Dowling", "email": "mtdowling@gmail.com", "homepage": "https://github.com/mtdowling" }, + { + "name": "George Mponos", + "email": "gmponos@gmail.com", + "homepage": "https://github.com/gmponos" + }, + { + "name": "Tobias Nyholm", + "email": "tobias.nyholm@gmail.com", + "homepage": "https://github.com/Nyholm" + }, + { + "name": "Márk Sági-Kazár", + "email": "mark.sagikazar@gmail.com", + "homepage": "https://github.com/sagikazarmark" + }, { "name": "Tobias Schultze", + "email": "webmaster@tubo-world.de", "homepage": "https://github.com/Tobion" } ], @@ -411,22 +462,36 @@ ], "support": { "issues": "https://github.com/guzzle/psr7/issues", - "source": "https://github.com/guzzle/psr7/tree/1.8.2" + "source": "https://github.com/guzzle/psr7/tree/1.8.3" }, - "time": "2021-04-26T09:17:50+00:00" + "funding": [ + { + "url": "https://github.com/GrahamCampbell", + "type": "github" + }, + { + "url": "https://github.com/Nyholm", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/psr7", + "type": "tidelift" + } + ], + "time": "2021-10-05T13:56:00+00:00" }, { "name": "maxmind-db/reader", - "version": "v1.10.1", + "version": "v1.11.0", "source": { "type": "git", "url": "https://github.com/maxmind/MaxMind-DB-Reader-php.git", - "reference": "569bd44d97d30a4ec12c7793a33004a76d4caf18" + "reference": "b1f3c0699525336d09cc5161a2861268d9f2ae5b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/maxmind/MaxMind-DB-Reader-php/zipball/569bd44d97d30a4ec12c7793a33004a76d4caf18", - "reference": "569bd44d97d30a4ec12c7793a33004a76d4caf18", + "url": "https://api.github.com/repos/maxmind/MaxMind-DB-Reader-php/zipball/b1f3c0699525336d09cc5161a2861268d9f2ae5b", + "reference": "b1f3c0699525336d09cc5161a2861268d9f2ae5b", "shasum": "" }, "require": { @@ -436,7 +501,7 @@ "ext-maxminddb": "<1.10.1,>=2.0.0" }, "require-dev": { - "friendsofphp/php-cs-fixer": "*", + "friendsofphp/php-cs-fixer": "3.*", "php-coveralls/php-coveralls": "^2.1", "phpstan/phpstan": "*", "phpunit/phpcov": ">=6.0.0", @@ -476,9 +541,9 @@ ], "support": { "issues": "https://github.com/maxmind/MaxMind-DB-Reader-php/issues", - "source": "https://github.com/maxmind/MaxMind-DB-Reader-php/tree/v1.10.1" + "source": "https://github.com/maxmind/MaxMind-DB-Reader-php/tree/v1.11.0" }, - "time": "2021-04-14T17:49:35+00:00" + "time": "2021-10-18T15:23:10+00:00" }, { "name": "maxmind/web-service-common", @@ -728,20 +793,20 @@ }, { "name": "paypal/paypal-checkout-sdk", - "version": "1.0.1", + "version": "1.0.2", "source": { "type": "git", "url": "https://github.com/paypal/Checkout-PHP-SDK.git", - "reference": "ed6a55075448308b87a8b59dcb7fedf04a048cb1" + "reference": "19992ce7051ff9e47e643f28abb8cc1b3e5f1812" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paypal/Checkout-PHP-SDK/zipball/ed6a55075448308b87a8b59dcb7fedf04a048cb1", - "reference": "ed6a55075448308b87a8b59dcb7fedf04a048cb1", + "url": "https://api.github.com/repos/paypal/Checkout-PHP-SDK/zipball/19992ce7051ff9e47e643f28abb8cc1b3e5f1812", + "reference": "19992ce7051ff9e47e643f28abb8cc1b3e5f1812", "shasum": "" }, "require": { - "paypal/paypalhttp": "1.0.0" + "paypal/paypalhttp": "1.0.1" }, "require-dev": { "phpunit/phpunit": "^5.7" @@ -774,23 +839,22 @@ "sdk" ], "support": { - "issues": "https://github.com/paypal/Checkout-PHP-SDK/issues", - "source": "https://github.com/paypal/Checkout-PHP-SDK/tree/1.0.1" + "source": "https://github.com/paypal/Checkout-PHP-SDK/tree/1.0.2" }, - "time": "2019-11-07T23:16:44+00:00" + "time": "2021-09-21T20:57:38+00:00" }, { "name": "paypal/paypalhttp", - "version": "1.0.0", + "version": "1.0.1", "source": { "type": "git", "url": "https://github.com/paypal/paypalhttp_php.git", - "reference": "1ad9b846a046f09d6135cbf2cbaa7701bbc630a3" + "reference": "7b09c89c80828e842c79230e7f156b61fbb68d25" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paypal/paypalhttp_php/zipball/1ad9b846a046f09d6135cbf2cbaa7701bbc630a3", - "reference": "1ad9b846a046f09d6135cbf2cbaa7701bbc630a3", + "url": "https://api.github.com/repos/paypal/paypalhttp_php/zipball/7b09c89c80828e842c79230e7f156b61fbb68d25", + "reference": "7b09c89c80828e842c79230e7f156b61fbb68d25", "shasum": "" }, "require": { @@ -818,23 +882,22 @@ ], "support": { "issues": "https://github.com/paypal/paypalhttp_php/issues", - "source": "https://github.com/paypal/paypalhttp_php/tree/1.0.0" + "source": "https://github.com/paypal/paypalhttp_php/tree/1.0.1" }, - "abandoned": true, - "time": "2019-11-06T21:27:12+00:00" + "time": "2021-09-14T21:35:26+00:00" }, { "name": "phpmailer/phpmailer", - "version": "v6.5.1", + "version": "v6.5.3", "source": { "type": "git", "url": "https://github.com/PHPMailer/PHPMailer.git", - "reference": "dd803df5ad7492e1b40637f7ebd258fee5ca7355" + "reference": "baeb7cde6b60b1286912690ab0693c7789a31e71" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/dd803df5ad7492e1b40637f7ebd258fee5ca7355", - "reference": "dd803df5ad7492e1b40637f7ebd258fee5ca7355", + "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/baeb7cde6b60b1286912690ab0693c7789a31e71", + "reference": "baeb7cde6b60b1286912690ab0693c7789a31e71", "shasum": "" }, "require": { @@ -891,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.1" + "source": "https://github.com/PHPMailer/PHPMailer/tree/v6.5.3" }, "funding": [ { @@ -899,7 +962,7 @@ "type": "github" } ], - "time": "2021-08-18T09:14:16+00:00" + "time": "2021-11-25T16:34:11+00:00" }, { "name": "psr/http-message", @@ -1075,6 +1138,7 @@ "type": "github" } ], + "abandoned": true, "time": "2021-02-15T19:23:18+00:00" }, { @@ -1144,16 +1208,16 @@ }, { "name": "stripe/stripe-php", - "version": "v7.94.0", + "version": "v7.105.0", "source": { "type": "git", "url": "https://github.com/stripe/stripe-php.git", - "reference": "03cd6b5c1c4fc9087ddd1dd046457bff274294d6" + "reference": "3a926610ca772aa7519fb132c88a6e7472788d90" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/stripe/stripe-php/zipball/03cd6b5c1c4fc9087ddd1dd046457bff274294d6", - "reference": "03cd6b5c1c4fc9087ddd1dd046457bff274294d6", + "url": "https://api.github.com/repos/stripe/stripe-php/zipball/3a926610ca772aa7519fb132c88a6e7472788d90", + "reference": "3a926610ca772aa7519fb132c88a6e7472788d90", "shasum": "" }, "require": { @@ -1163,11 +1227,10 @@ "php": ">=5.6.0" }, "require-dev": { - "friendsofphp/php-cs-fixer": "2.17.1", - "php-coveralls/php-coveralls": "^2.1", - "phpunit/phpunit": "^5.7", - "squizlabs/php_codesniffer": "^3.3", - "symfony/process": "~3.4" + "friendsofphp/php-cs-fixer": "3.2.1", + "phpstan/phpstan": "^1.2", + "phpunit/phpunit": "^5.7 || ^9.0", + "squizlabs/php_codesniffer": "^3.3" }, "type": "library", "extra": { @@ -1199,9 +1262,9 @@ ], "support": { "issues": "https://github.com/stripe/stripe-php/issues", - "source": "https://github.com/stripe/stripe-php/tree/v7.94.0" + "source": "https://github.com/stripe/stripe-php/tree/v7.105.0" }, - "time": "2021-08-19T14:15:27+00:00" + "time": "2021-12-06T22:51:55+00:00" }, { "name": "symfony/polyfill-intl-idn", @@ -2171,21 +2234,21 @@ "packages-dev": [ { "name": "filp/whoops", - "version": "2.14.0", + "version": "2.14.4", "source": { "type": "git", "url": "https://github.com/filp/whoops.git", - "reference": "fdf92f03e150ed84d5967a833ae93abffac0315b" + "reference": "f056f1fe935d9ed86e698905a957334029899895" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filp/whoops/zipball/fdf92f03e150ed84d5967a833ae93abffac0315b", - "reference": "fdf92f03e150ed84d5967a833ae93abffac0315b", + "url": "https://api.github.com/repos/filp/whoops/zipball/f056f1fe935d9ed86e698905a957334029899895", + "reference": "f056f1fe935d9ed86e698905a957334029899895", "shasum": "" }, "require": { "php": "^5.5.9 || ^7.0 || ^8.0", - "psr/log": "^1.0.1" + "psr/log": "^1.0.1 || ^2.0 || ^3.0" }, "require-dev": { "mockery/mockery": "^0.9 || ^1.0", @@ -2230,7 +2293,7 @@ ], "support": { "issues": "https://github.com/filp/whoops/issues", - "source": "https://github.com/filp/whoops/tree/2.14.0" + "source": "https://github.com/filp/whoops/tree/2.14.4" }, "funding": [ { @@ -2238,7 +2301,7 @@ "type": "github" } ], - "time": "2021-07-13T12:00:00+00:00" + "time": "2021-10-03T12:00:00+00:00" }, { "name": "kint-php/kint", @@ -2297,21 +2360,21 @@ }, { "name": "maximebf/debugbar", - "version": "v1.17.1", + "version": "v1.17.3", "source": { "type": "git", "url": "https://github.com/maximebf/php-debugbar.git", - "reference": "0a3532556be0145603f8a9de23e76dc28eed7054" + "reference": "e8ac3499af0ea5b440908e06cc0abe5898008b3c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/0a3532556be0145603f8a9de23e76dc28eed7054", - "reference": "0a3532556be0145603f8a9de23e76dc28eed7054", + "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/e8ac3499af0ea5b440908e06cc0abe5898008b3c", + "reference": "e8ac3499af0ea5b440908e06cc0abe5898008b3c", "shasum": "" }, "require": { "php": "^7.1|^8", - "psr/log": "^1.0", + "psr/log": "^1|^2|^3", "symfony/var-dumper": "^2.6|^3|^4|^5" }, "require-dev": { @@ -2356,9 +2419,9 @@ ], "support": { "issues": "https://github.com/maximebf/php-debugbar/issues", - "source": "https://github.com/maximebf/php-debugbar/tree/v1.17.1" + "source": "https://github.com/maximebf/php-debugbar/tree/v1.17.3" }, - "time": "2021-08-01T09:19:02+00:00" + "time": "2021-10-19T12:33:27+00:00" }, { "name": "psr/log", @@ -2575,16 +2638,16 @@ }, { "name": "symfony/var-dumper", - "version": "v4.4.27", + "version": "v4.4.34", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "391d6d0e7a06ab54eb7c38fab29b8d174471b3ba" + "reference": "2d0c056b2faaa3d785bdbd5adecc593a5be9c16e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/391d6d0e7a06ab54eb7c38fab29b8d174471b3ba", - "reference": "391d6d0e7a06ab54eb7c38fab29b8d174471b3ba", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/2d0c056b2faaa3d785bdbd5adecc593a5be9c16e", + "reference": "2d0c056b2faaa3d785bdbd5adecc593a5be9c16e", "shasum": "" }, "require": { @@ -2644,7 +2707,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v4.4.27" + "source": "https://github.com/symfony/var-dumper/tree/v4.4.34" }, "funding": [ { @@ -2660,7 +2723,7 @@ "type": "tidelift" } ], - "time": "2021-07-23T15:41:52+00:00" + "time": "2021-11-12T10:50:54+00:00" } ], "aliases": [], diff --git a/lang/1.php b/lang/1.php index 7a36deda0..f23f10558 100644 --- a/lang/1.php +++ b/lang/1.php @@ -5029,10 +5029,10 @@ $lang = array ( 'srv_svetovanje_uporaba' => "Uporaba 1KA", 'srv_svetovanje_statistika' => "Statistika", 'srv_svetovanje_metodologija' => "Metodologija", - 'srv_footer_links' => "                            O 1KA - | Pomoč - | Pogoji uporabe - | Cenik", + 'srv_footer_links' => "O 1KA + Pomoč + Pogoji uporabe + Cenik", 'srv_footer_1ka_version' => "1KA verzija", 'srv_footer_drupal_version' => "Drupal", 'srv_footer_copyright' => "UL FDV, CDI", diff --git a/lang/2.php b/lang/2.php index 4191d480f..283ec72b0 100644 --- a/lang/2.php +++ b/lang/2.php @@ -5000,10 +5000,10 @@ $lang = array ( 'srv_svetovanje_uporaba' => "Using 1KA", 'srv_svetovanje_statistika' => "Statistics", 'srv_svetovanje_metodologija' => "Methodology", - 'srv_footer_links' => "About 1KA - | Help - | Terms of use - | Pricelist", + 'srv_footer_links' => "About 1KA + Help + Terms of use + Pricelist", 'srv_footer_1ka_version' => "1KA version", 'srv_footer_drupal_version' => "Drupal", 'srv_footer_copyright' => "UL FDV, CDI", diff --git a/public/css/admin_new.css b/public/css/admin_new.css index 66df3945e..4fa2ab104 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -5151,6 +5151,668 @@ a.faicon.fa-stack { width: 1em; } +/* +To change this license header, choose License Headers in Project Properties. +To change this template file, choose Tools | Templates +and open the template in the editor. +*/ +/* + Created on : 21-Sep-2018 + Author : Peter Hrvatin +*/ +.enka-custom-radio::before { + letter-spacing: 10px; + color: #E5E5E5; +} +.enka-custom-radio.star::before { + content: "\f005"; +} +.enka-custom-radio.thumb::before { + content: "\f164"; +} +.enka-custom-radio.smiley::before { + content: "\f118"; +} +.enka-custom-radio.heart::before { + content: "\f004"; +} +.enka-custom-radio.flag::before { + content: "\f024"; +} +.enka-custom-radio.user::before { + content: "\f007"; +} + +/* visual analog scale - radio buttons */ +.enka-vizualna-skala::before { + font-family: "Font Awesome 5 Free"; + font-size: 20px; + letter-spacing: 10px; + color: #E5E5E5; +} +.enka-vizualna-skala.siv-61::before, .enka-vizualna-skala.siv-71::before { + content: "\f5b4"; +} +.enka-vizualna-skala.siv-41::before, .enka-vizualna-skala.siv-51::before, .enka-vizualna-skala.siv-62::before, .enka-vizualna-skala.siv-72::before { + content: "\f57a"; +} +.enka-vizualna-skala.siv-21::before, .enka-vizualna-skala.siv-31::before, .enka-vizualna-skala.siv-42::before, .enka-vizualna-skala.siv-52::before, .enka-vizualna-skala.siv-63::before, .enka-vizualna-skala.siv-73::before { + content: "\f119"; +} +.enka-vizualna-skala.siv-32::before, .enka-vizualna-skala.siv-53::before, .enka-vizualna-skala.siv-74::before { + content: "\f11a"; +} +.enka-vizualna-skala.siv-22::before, .enka-vizualna-skala.siv-33::before, .enka-vizualna-skala.siv-43::before, .enka-vizualna-skala.siv-54::before, .enka-vizualna-skala.siv-64::before, .enka-vizualna-skala.siv-75::before { + content: "\f118"; +} +.enka-vizualna-skala.siv-44::before, .enka-vizualna-skala.siv-55::before, .enka-vizualna-skala.siv-65::before, .enka-vizualna-skala.siv-76::before { + content: "\f580"; +} +.enka-vizualna-skala.siv-66::before, .enka-vizualna-skala.siv-77::before { + content: "\f59c"; +} + +/* +To change this license header, choose License Headers in Project Properties. +To change this template file, choose Tools | Templates +and open the template in the editor. +*/ +/* + Created on : 21-Sep-2018 + Author : Peter Hrvatin +*/ +/* icons */ +span.faicon.plus::before { + content: "\f067"; +} + +span.faicon.minus::before { + content: "\f068"; +} + +span.faicon.close::before { + font-size: 18px; + font-weight: 400; + content: "\f057"; +} + +span.faicon.dropdown_blue::before { + font-size: 16px; + content: "\f13a"; +} + +span.faicon.dropup_blue::before { + font-size: 16px; + content: "\f139"; +} + +span.faicon.arrow_back::before { + font-weight: 600; + font-size: 16px; + content: "\f137"; +} + +span.faicon.add::before { + font-size: 18px; + content: "\f055"; +} + +span.faicon.remove::before { + font-size: 18px; + content: "\f056"; +} + +span.faicon.delete::before { + font-size: 18px; + font-weight: 400; + content: "\f2ed"; +} + +span.faicon.anketa_delete::before { + font-size: 24px; + font-weight: 400; + content: "\f2ed"; +} + +span.faicon.copy::before { + font-size: 18px; + content: "\f0c5"; + font-weight: 400; +} + +span.faicon.anketa_copy::before { + font-size: 24px; + content: "\f0c5"; + font-weight: 400; +} + +span.faicon.export::before { + font-size: 24px; + content: "\f56e"; +} + +/*span.faicon.import::before{ + font-size: 24px; + content: "\f56f"; +}*/ +span.faicon.import { + width: 32px; +} + +span.faicon.import::before { + font-size: 24px; + font-weight: 400; + content: "\f1c2"; +} + +span.faicon.import::after { + font-size: 14px; + content: "\f061"; + display: inline-block; +} + +span.faicon.library::before { + font-size: 24px; + content: "\f518"; +} + +span.faicon.folder::before { + font-size: 22px; + content: "\f07b"; + vertical-align: middle; +} + +span.faicon.after.sort_down_arrow::after { + content: "\f0d7"; + margin-left: 5px; +} + +span.faicon.after.sort_up_arrow::after { + content: "\f0d8"; + margin-left: 5px; +} + +span.faicon.info::before { + font-size: 28px; + content: "\f05a"; + vertical-align: middle; +} + +span.faicon.pagination_left::before { + margin: 0 1px 0 1px; + content: "\f104"; +} + +span.faicon.pagination_right::before { + margin: 0 0 0 1px; + content: "\f105"; +} + +span.faicon.edit::before { + font-size: 16px; + content: "\f304"; +} + +span.faicon.refresh::before { + font-size: 18px; + content: "\f2f1"; +} + +span.faicon.filter::before { + font-size: 18px; + content: "\f0b0"; +} + +span.faicon.star::before, +span.faicon.star_off::before { + font-size: 14px; + font-weight: 400; + content: "\f005"; +} + +span.faicon.star_on::before { + font-size: 14px; + font-weight: 700; + content: "\f005"; +} + +span.faicon.search::before { + font-size: 20px; + content: "\f002"; +} + +span.faicon.help2::before { + font-size: 20px; + content: "\f059"; +} + +span.faicon.user::before { + font-size: 18px; + content: "\f007"; +} + +span.faicon.logout::before { + font-size: 20px; + content: "\f2f5"; +} + +span.faicon.monitor::before { + font-size: 18px; + content: "\f108"; +} + +span.faicon.users::before { + font-size: 18px; + content: "\f500"; +} + +span.faicon.lock_open::before { + font-size: 18px; + content: "\f3c1"; +} + +span.faicon.lock_close::before { + font-size: 18px; + content: "\f023"; +} + +span.faicon.bottom_saving::before { + font-size: 24px; + font-weight: 400; + content: "\f0c7"; +} + +span.faicon.bottom_publish::before { + font-size: 24px; + content: "\f093"; +} + +span.faicon.bottom_preview { + width: 20px; +} + +span.faicon.bottom_preview::before { + font-size: 24px; + font-weight: 400; + content: "\f15b"; +} + +span.faicon.bottom_preview::after { + font-size: 14px; + content: "\f002"; + display: inline-block; + margin-left: -70%; +} + +span.faicon.bottom_test::before { + font-size: 24px; + content: "\f492"; +} + +span.faicon.language::before { + font-size: 24px; + content: "\f0ac"; +} + +span.faicon.mobile_off::before { + font-size: 24px; + content: "\f3cd"; +} + +span.faicon.mobile_off::after { + font-size: 24px; + content: "\f715"; + margin-left: -23px; +} + +span.faicon.comments::before { + font-size: 24px; + content: "\f27a"; +} + +span.faicon.comments_num::before { + font-size: 24px; + content: "\f27a"; +} + +span.faicon.comments_num strong { + color: white; + font-family: Source Sans Pro, sans-serif; + margin-top: -2px; +} + +span.faicon.data_link::before { + font-size: 20px; + content: "\f0c1"; +} + +span.faicon.data_link_small::before { + font-size: 16px; + content: "\f0c1"; +} + +span.faicon.print::before { + font-size: 24px; + content: "\f02f"; +} + +span.faicon.print_small::before { + font-size: 16px; + content: "\f02f"; +} + +span.faicon.preview { + width: 18px; +} + +span.faicon.preview::before { + font-size: 18px; + font-weight: 400; + content: "\f15b"; +} + +span.faicon.preview::after { + content: "\f002"; + display: inline-block; + font-size: 11px; + margin-left: -50%; +} + +span.faicon.palette::before { + font-size: 18px; + content: "\f53f"; +} + +span.faicon.inline_comment::before { + font-size: 14px; + font-weight: 400; + content: "\f075"; +} + +span.faicon.inline_double_comment::before { + font-size: 14px; + font-weight: 400; + content: "\f086"; +} + +span.faicon.comments_creport::before { + font-size: 16px; + content: "\f086"; +} + +span.faicon.compress::before { + font-size: 15px; + content: "\f066"; +} + +span.faicon.expand::before { + font-size: 15px; + content: "\f065"; +} + +span.faicon.hashtag::before { + font-size: 15px; + content: "\f292"; +} + +span.faicon.bug::before { + font-size: 15px; + content: "\f188"; +} + +span.faicon.paragraph::before { + font-size: 15px; + content: "\f1dd"; +} + +span.faicon.replace::before { + font-size: 15px; + content: "\f362"; +} + +span.faicon.plus_square::before { + font-size: 15px; + font-weight: 400; + content: "\f0fe"; +} + +span.faicon.minus_square::before { + font-size: 15px; + font-weight: 400; + content: "\f146"; +} + +span.faicon.delete_circle::before { + font-size: 14px; + content: "\f056"; +} + +span.faicon.quick_view::before { + font-size: 15px; + font-weight: 400; + content: "\f06e"; +} + +span.faicon.edit_square::before { + font-size: 15px; + content: "\f044"; +} + +span.faicon.test::before { + font-size: 15px; + content: "\f492"; +} + +a.faicon.if_add { + font-size: 12px; + font-family: Source Sans Pro, sans-serif; + font-weight: 400; +} +a.faicon.if_add:before { + background-color: #1E88E5; + font-weight: 500; + padding: 2px 4px; + color: white; + content: "IF"; +} +a.faicon.if_add:hover:before { + background-color: #0059ab; +} + +span.faicon.if_add { + font-size: 12px; + font-family: Source Sans Pro, sans-serif; + font-weight: 400; +} +span.faicon.if_add:before { + background-color: #1E88E5; + font-weight: 500; + padding: 2px 4px; + color: white; + content: "IF"; +} +span.faicon.if_add:hover:before { + background-color: #0059ab; +} + +span.faicon.text_file::before { + font-size: 24px; + font-weight: 400; + content: "\f15c"; +} + +span.faicon.text_file_small { + height: 20px; + vertical-align: middle; +} +span.faicon.text_file_small:before { + font-size: 18px; + font-weight: 400; + content: "\f15c"; +} + +span.faicon.warning::before { + font-size: 16px; + content: "\f071"; +} + +span.faicon.users_small::before { + font-size: 16px; + content: "\f0c0"; +} + +span.faicon.popup_0::before { + font-size: 14px; + content: "\f065"; + color: #1E88E5; +} + +span.faicon.popup_1::before { + font-size: 14px; + content: "\f065"; + color: #0059ab; +} + +span.faicon.flat_0::before { + font-size: 14px; + content: "\f03c"; + color: #0059ab; +} + +span.faicon.flat_1::before { + font-size: 14px; + content: "\f03c"; + color: #1E88E5; +} + +span.basic-icon.spss::before { + content: "Σ"; + line-height: 26px; + vertical-align: bottom; + font-size: 30px !important; + font-weight: bold; +} + +span.faicon.external_link::before { + font-size: 14px; + font-weight: 600; + content: "\f35d"; +} + +span.faicon.cog_large::before { + font-size: 34px; + font-weight: 600; + content: "\f013"; +} + +span.faicon.chart_large::before { + font-size: 34px; + font-weight: 600; + content: "\f201"; +} + +span.faicon.reload_large::before { + font-size: 34px; + font-weight: 600; + content: "\f021"; +} + +/* CALENDAR */ +span.faicon.calendar_icon::before, +button.ui-datepicker-trigger::before { + font-family: "Font Awesome 5 Free"; + font-weight: 400; + font-size: 16px; + content: "\f073"; +} + +/* ARROWS */ +span.faicon.arrow_up::before { + font-size: 14px; + content: "\f062"; + color: #E5E5E5; +} + +span.faicon.arrow2_r::before { + font-size: 14px; + content: "\f054"; +} + +span.faicon.arrow2_l::before { + font-size: 14px; + content: "\f053"; +} + +span.faicon.arrow2_d::before { + font-size: 14px; + content: "\f078"; +} + +span.faicon.arrow2_u::before { + font-size: 14px; + content: "\f077"; +} + +span.faicon.arrow_large2_r::before { + font-size: 35px; + content: "\f054"; +} + +span.faicon.arrow_large2_l::before { + font-size: 35px; + content: "\f053"; +} + +span.faicon.arrow_verylarge2_r::before { + font-size: 40px; + content: "\f054"; +} + +span.faicon.arrow_verylarge2_l::before { + font-size: 40px; + content: "\f053"; +} + +span.faicon.sort_descending::before { + font-size: 14px; + content: "\f0d7"; +} + +span.faicon.sort_ascending::before { + font-size: 14px; + content: "\f0d8"; +} + +/* Plus/minus sqare */ +span.folder_plusminus { + text-indent: 0px !important; + font-style: normal !important; +} + +span.faicon.plus_orange::before { + font-size: 12px; + font-weight: 400; + content: "\f0fe"; +} + +span.faicon.minus_orange::before { + font-size: 12px; + font-weight: 400; + content: "\f146"; +} + +/* Spinner */ +span.faicon.spinner::before { + font-size: 18px; + content: "\f110"; +} + +/* Bars - mobile menu */ +span.faicon.bars::before { + font-size: 26px; + content: "\f0c9"; +} + span.faicon.lock_open::before { content: "\f3c1"; } @@ -5206,6 +5868,645 @@ div.icon_holder a.faicon { margin-left: 12px; } +/* +To change this license header, choose License Headers in Project Properties. +To change this template file, choose Tools | Templates +and open the template in the editor. +*/ +/* + Created on : 21-Sep-2018 + Author : Peter Hrvatin +*/ +/* NAPREDNI MODULI */ +span.module_icon { + padding: 0 6px; + color: white; + font-weight: 700; + font-size: 16px; + background-color: transparent; + border: 1px #FFFFFF solid; +} + +span.module_icon.maza::before { + content: "MAZA"; +} + +span.module_icon.wpn::before { + content: "WPN"; +} + +span.module_icon.panel::before { + content: "Panel"; +} + +span.module_icon.telephone::before { + content: "TEL"; +} + +span.module_icon.slideshow::before { + content: "SS"; +} + +span.module_icon.evalvation::before { + content: "EVAL"; +} + +span.module_icon.vnos::before { + content: "V"; +} + +span.module_icon.social::before { + content: "SN"; +} + +span.module_icon.quiz::before { + content: "Q"; +} + +span.module_icon.voting::before { + content: "VOTE"; +} + +span.module_icon.advanced_paradata::before { + content: "AP"; +} + +span.module_icon.chat::before { + content: "C"; +} + +span.module_icon.degrees_1ka::before { + content: "360"; +} + +span.module_icon.mju::before { + content: "H"; +} + +span.module_icon.sa-hierarhija::before { + content: "SA"; +} + +span.module_icon.degrees::before { + content: "360"; +} + +span.module_icon.borza::before { + content: "Borza"; +} + +span.module_icon.evoli::before { + content: "Evoli"; +} + +span.module_icon.evoli_teammeter::before { + content: "Evoli TM"; +} + +span.module_icon.evoli_quality_climate::before { + content: "Evoli QC"; +} + +span.module_icon.evoli_teamship_meter::before { + content: "Evoli TSM"; +} + +span.module_icon.evoli_organizational_employeeship_meter::before { + content: "Evoli OEM"; +} + +span.module_icon.evoli_employmeter::before { + content: "Evoli EM"; +} + +span.module_icon.excell_matrix::before { + content: "EM"; +} + +span.module_icon.mfdps::before { + content: "MFDPS"; +} + +span.module_icon.mju::before { + content: "MJU"; +} + +span.module_icon.gdpr { + color: #E5E5E5; + background-color: #1E88E5; + border: 1px #FFFFFF solid; +} +span.module_icon.gdpr:hover { + color: #FFFFFF; +} + +span.module_icon.gdpr.active { + color: white; + background-color: #1E88E5; + border: 1px #FFFFFF solid; +} +span.module_icon.gdpr.active:hover { + color: white; + border: 1px #FFFFFF solid; +} + +span.module_icon.gdpr::before { + content: "GDPR"; +} + +/* +To change this license header, choose License Headers in Project Properties. +To change this template file, choose Tools | Templates +and open the template in the editor. +*/ +/* + Created on : 21-Sep-2018 + Author : Peter Hrvatin +*/ +/* Toolbox na levi strani */ +span.faicon.wheel_32::before { + content: "\f013"; + font-size: 20px; +} + +span.faicon.radio_32::before { + content: "\f192"; + font-weight: 400; + font-size: 18px; +} + +span.faicon.check_32::before { + content: "\f14a"; + font-weight: 400; + font-size: 18px; +} + +span.faicon.matrix_32::before { + content: "\f192\f192\a\f192\f192"; + white-space: pre; + font-weight: 400; + font-size: 12px; +} + +span.faicon.abc_32::before { + content: "ABC"; + font-family: Source Sans Pro, sans-serif; + font-size: 16px; +} + +span.faicon.number_32::before { + content: "123"; + font-family: Source Sans Pro, sans-serif; + font-size: 16px; +} + +span.faicon.nagovor::before { + content: "T"; + font-size: 18px; +} + +span.faicon.plus_32::before { + content: "\f055"; + font-size: 18px; +} + +span.faicon.if_32::before { + content: "IF"; + font-family: Source Sans Pro, sans-serif; + font-size: 16px; +} + +span.faicon.block_32::before { + content: "B"; + font-family: Source Sans Pro, sans-serif; + font-size: 16px; +} + +span.faicon.loop_32::before { + content: "L"; + font-family: Source Sans Pro, sans-serif; + font-size: 15px; +} + +/* +To change this license header, choose License Headers in Project Properties. +To change this template file, choose Tools | Templates +and open the template in the editor. +*/ +/* + Created on : 21-Sep-2018 + Author : Peter Hrvatin +*/ +/* question editing icons */ +a.faicon { + color: #1E88E5 !important; +} +a.faicon:hover { + color: #0059ab !important; +} + +span.faicon.edit-vprasanje { + line-height: 25px; +} +span.faicon.edit-vprasanje:before { + font-size: 18px; + content: "\f031"; +} + +a.faicon.edit::before { + font-size: 16px; + content: "\f304"; +} + +a.faicon.addif::before { + font-family: Montserrat, sans-serif; + font-size: 18px; + font-weight: 900; + content: "IF"; +} + +a.faicon.copy::before { + font-size: 18px; + font-weight: 400; + content: "\f0c5"; +} + +a.faicon.copycond::before { + font-size: 18px; + content: "\f0c5"; +} + +a.faicon.preview::before { + font-size: 18px; + font-weight: 400; + content: "\f15b"; +} + +a.faicon.preview::after { + content: "\f002"; + display: inline-block; + font-size: 11px; + margin-left: -50%; +} + +a.faicon.arhiv::before { + font-size: 18px; + content: "\f044"; +} + +a.faicon.delete::before { + font-size: 18px; + font-weight: 400; + content: "\f2ed"; +} + +a.faicon.hide::before { + font-size: 18px; + font-weight: 400; + content: "\f06e"; +} + +a.faicon.unhide_icon::before { + font-size: 18px; + font-weight: 400; + content: "\f070"; +} + +/* Urejanje vrednosti inline */ +.variabla span.inline.faicon::before { + color: #1E88E5; +} + +.variabla span.inline.faicon:hover::before { + color: #0059ab; +} + +.variabla span.inline.faicon.edit2::before { + font-size: 14px; + content: "\f304"; +} + +.variabla span.inline.faicon.odg_hidden::before { + font-size: 14px; + content: "\f05e"; +} + +.variabla span.inline.faicon.odg_hidden.show-hidden::before { + color: #FF0000; +} + +.variabla span.inline.faicon.odg_hidden.show-disable::before { + color: #FFC700; +} + +.variabla span.inline.faicon.odg_if_not::before { + font-family: Montserrat, sans-serif; + font-size: 15px; + font-weight: 900; + content: "IF*"; +} + +.variabla span.inline.faicon.odg_if_follow::before { + font-family: Montserrat, sans-serif; + font-size: 15px; + font-weight: 900; + content: "IF🠞"; +} + +.variabla span.inline.faicon.correct::before { + font-size: 14px; + font-weight: 900; + content: "\f00c"; +} + +.variabla span.inline.faicon.move_updown::before { + font-size: 16px; + color: #0059ab; + content: "\f338"; +} + +/* +To change this license header, choose License Headers in Project Properties. +To change this template file, choose Tools | Templates +and open the template in the editor. +*/ +/* + Created on : 7-Okt-2018 + Author : Peter Hrvatin +*/ +/* Knjiznica */ +span.faicon.mapca.anketa::before { + font-size: 16px; + font-weight: 400; + content: "\f022"; +} + +span.faicon.table::before { + font-size: 16px; + content: "\f00b"; +} + +span.faicon.other_vprasanja::before { + font-size: 16px; + content: "\f0ca" !important; +} + +span.faicon.osnovna_vprasanja::before { + font-size: 16px; + content: "\f0ca"; +} + +span.faicon.mapca.if::before { + font-family: Source Sans Pro, sans-serif; + font-weight: 500; + font-size: 16px; + content: "IF"; +} + +span.faicon.mapca.b::before { + font-family: Source Sans Pro, sans-serif; + font-weight: 500; + font-size: 16px; + content: "B"; +} + +/* +To change this license header, choose License Headers in Project Properties. +To change this template file, choose Tools | Templates +and open the template in the editor. +*/ +/* + Created on : 8-Okt-2018 + Author : Peter Hrvatin +*/ +/* Izvozi */ +span.faicon.pdf::before { + font-size: 16px; + font-weight: 400; + content: "\f1c1"; + color: #ed1c24; +} + +span.faicon.pdf.black { + color: #E5E5E5 !important; +} +span.faicon.pdf.black:hover { + color: #ed1c24 !important; +} + +a:hover span.faicon.pdf.black { + color: #ed1c24 !important; +} + +span.faicon.pdf.black::before { + color: inherit !important; +} + +span.faicon.xls::before { + font-size: 16px; + font-weight: 400; + content: "\f1c3"; + color: #008000; +} + +span.faicon.xls.black { + color: #E5E5E5 !important; +} +span.faicon.xls.black:hover { + color: #008000 !important; +} + +a:hover span.faicon.xls.black { + color: #008000 !important; +} + +span.faicon.xls.black::before { + color: inherit !important; +} + +span.faicon.rtf::before { + font-size: 16px; + font-weight: 400; + content: "\f1c2"; + color: #0f3ea8; +} + +span.faicon.rtf.black { + color: #E5E5E5 !important; +} +span.faicon.rtf.black:hover { + color: #0f3ea8 !important; +} + +a:hover span.faicon.rtf.black { + color: #0f3ea8 !important; +} + +span.faicon.rtf.black::before { + color: inherit !important; +} + +span.faicon.ppt::before { + font-size: 16px; + font-weight: 400; + content: "\f1c4"; + color: #fa4913; +} + +span.faicon.ppt.black { + color: #E5E5E5 !important; +} +span.faicon.ppt.black:hover { + color: #fa4913 !important; +} + +a:hover span.faicon.ppt.black { + color: #fa4913 !important; +} + +span.faicon.ppt.black::before { + color: inherit !important; +} + +span.faicon.xml::before { + font-size: 16px; + font-weight: 400; + content: "\f1c9"; + color: #00a000; +} + +span.faicon.xml.black { + color: #E5E5E5 !important; +} +span.faicon.xml.black:hover { + color: #00a000 !important; +} + +a:hover span.faicon.xml.black { + color: #00a000 !important; +} + +span.faicon.xml.black::before { + color: inherit !important; +} + +span.faicon.arhiv::before { + font-size: 16px; + content: "\f187"; +} + +span.faicon.arhiv_mail::before { + font-size: 16px; + font-weight: 400; + content: "\f14d"; +} + +/* +To change this license header, choose License Headers in Project Properties. +To change this template file, choose Tools | Templates +and open the template in the editor. +*/ +/* + Created on : 10-Okt-2018 + Author : Peter Hrvatin +*/ +/* Analiza */ +span.faicon.an_sigma::before { + font-family: Source Sans Pro, sans-serif; + font-weight: 700; + content: "Σ"; + vertical-align: middle; +} + +span.faicon.an_sigmax::before { + font-family: Source Sans Pro, sans-serif; + font-weight: 700; + content: "Σ*"; + vertical-align: middle; + margin-left: 3px; +} + +span.faicon.an_freq::before { + font-family: Source Sans Pro, sans-serif; + font-weight: 700; + font-style: italic; + content: "f"; + vertical-align: middle; + margin-left: 3px; +} + +span.faicon.an_freqx::before { + font-family: Source Sans Pro, sans-serif; + font-weight: 700; + font-style: italic; + content: "f*"; + vertical-align: middle; + margin-left: 3px; +} + +span.faicon.an_stat::before { + font-family: Source Sans Pro, sans-serif; + font-weight: 700; + font-style: italic; + content: "s"; + vertical-align: middle; + margin-left: 3px; +} + +span.faicon.an_chart_bar::before { + font-size: 14px; + font-weight: 700; + /*content: "\f080";*/ + content: "\f200"; + margin-left: 3px; +} + +/* +To change this license header, choose License Headers in Project Properties. +To change this template file, choose Tools | Templates +and open the template in the editor. +*/ +/* + Created on : 10-Okt-2018 + Author : Peter Hrvatin +*/ +/* Invitation table */ +span.faicon.inv_sent_0::before { + font-size: 14px; + content: "\f2b6"; + font-weight: 400; +} + +span.faicon.inv_sent_1::before { + font-size: 14px; + content: "\f0e0"; +} + +span.faicon.inv_responded_0::before { + font-size: 14px; + font-weight: 400; + content: "\f005"; +} + +span.faicon.inv_responded_1::before { + font-size: 14px; + font-weight: 700; + content: "\f005"; +} + +span.faicon.inv_unsubscribed_0::before { + font-size: 14px; + font-weight: 400; + content: "\f111"; +} + +span.faicon.inv_unsubscribed_1::before { + font-size: 14px; + font-weight: 700; + content: "\f111"; + color: #FF0000; +} + a { cursor: pointer; color: #1E88E5; @@ -5454,28 +6755,35 @@ header #surveyNavigation { header #surveyNavigation #firstNavigation { display: flex; height: 50px; - width: 100%; padding-top: 10px; + margin-left: 32px; font-size: 16px; font-weight: 400; text-align: center; } -header #surveyNavigation #firstNavigation #mojeAnketeLink a { - color: #FFFFFF; - text-decoration: none; -} header #surveyNavigation #firstNavigation ol { display: flex; + padding: 0; + margin: 0; } header #surveyNavigation #firstNavigation ol li { list-style-image: none; list-style-position: outside; list-style-type: none; } -header #surveyNavigation #firstNavigation ol li a { +header #surveyNavigation #firstNavigation ol.navigation_buttons_list li { + padding: 14px 32px; +} +header #surveyNavigation #firstNavigation ol.navigation_buttons_list li a { color: #FFFFFF; text-decoration: none; } +header #surveyNavigation #firstNavigation ol.navigation_buttons_list li.active_on { + background-color: #FFFFFF; +} +header #surveyNavigation #firstNavigation ol.navigation_buttons_list li.active_on a { + color: #1E88E5; +} header #quick_comments_link.newCss { font-size: 12px; margin-top: 3px !important; @@ -5516,167 +6824,92 @@ header span.sprites.comments_orange_on { text-align: center; } header #secondNavigation { - display: block; - z-index: 1; - left: 0px; - right: 0px; - padding: 8px 20px 0 145px; - height: 33px; - border-bottom: 1px solid #1E88E5; - background-color: #ffffff; + display: flex; + height: 41px; + border-bottom: 1px solid #E5E5E5; } -header ul.secondNavigation { - display: inline-block; - float: left; - width: auto; - margin-top: 1px !important; - margin-bottom: 0; +header #secondNavigation ul.secondNavigation, +header #secondNavigation ul.secondNavigationArchive { + display: flex; + align-items: center; + margin: 0 0 0 32px; + padding: 0; } -header .secondNavigation { - display: inline-block; +header #secondNavigation ul.secondNavigation li, +header #secondNavigation ul.secondNavigationArchive li { list-style-image: none; list-style-position: outside; list-style-type: none; - padding: 0px; - width: 100%; + height: 41px; + border-bottom: 1px #E5E5E5 solid; } -header .secondNavigation li { - display: list-item; - float: left; - padding: 0px; - margin: 0px; +header #secondNavigation ul.secondNavigation li a, +header #secondNavigation ul.secondNavigationArchive li a { + padding: 12px 32px; + line-height: 41px; + font-size: 15px; + color: #808080; + text-decoration: none; } -header .secondNavigation .blank { - height: 12px; - width: 6px; +header #secondNavigation ul.secondNavigation li.active, header #secondNavigation ul.secondNavigation li:hover, +header #secondNavigation ul.secondNavigationArchive li.active, +header #secondNavigation ul.secondNavigationArchive li:hover { + border-bottom: 1px #1E88E5 solid; } -header .secondNavigation .no-img { - padding: 0px 12px !important; - background-image: none !important; -} -header .secondNavigation a { - display: block; - line-height: 30px; - font-size: 14px; - color: #E5E5E5; -} -header .secondNavigation a:hover { - border-bottom: 2px solid #FFC700; -} -header .secondNavigation a.active { - color: #FFC700; - background-color: inherit; - border-bottom: 2px solid #FFC700; -} -header .secondNavigation .side-left { - padding-left: 10px; -} -header .secondNavigation .side-right { - padding-right: 12px; -} -header .secondNavigation .space { - width: 20px; - height: 19px; - padding: 0px; -} -header .secondNavigation .single { - padding: 0px 12px 0px 24px¸; -} -header .secondNavigation .single:hover { - text-shadow: 0px 1px 0px #fff; -} -header .secondNavigation .single:active { - color: #E5E5E5; -} -header #secondNavigation.library { - padding-left: 35px; -} -header #secondNavigation.library a { - font-size: 14px; -} -header #secondNavigation.library ul.secondNavigation .space { - width: 25px; -} -header #secondNavigation_links { - position: relative; - float: right; - width: auto; - margin-top: -7px; - line-height: 38px; - z-index: 2; - text-align: right; -} -header #secondNavigation_links #hover_export { - display: none; - position: absolute; - z-index: 99999; - right: 10px; - top: 39px; - padding: 5px 0 5px 13px; - width: 180px; - text-align: left; - line-height: normal; - background-color: #ffffff; - border: 1px #1E88E5 solid; - -webkit-box-shadow: 0 5px 15px 0 rgba(0, 0, 0, 0.4); - box-shadow: 0 5px 15px 0 rgba(0, 0, 0, 0.4); - -moz-box-shadow: 0 5px 15px 0 rgba(0, 0, 0, 0.4); -} -header #secondNavigation_links #hover_export a { - display: block; - padding: 6px 0; - color: #E5E5E5; - font-size: 14px; - transition: 0.2s; -} -header #secondNavigation_links #hover_export a:hover { - color: #FFC700; -} -header #secondNavigation_links #hover_export span.hover_export_icon { - display: inline-block; - width: 40px; -} -header ul.secondNavigationArchive { - display: inline-block; - float: left; - width: auto; - padding: 0px; - margin: 0 0 0 10px !important; - padding-left: 23px; - padding-top: 0px; - font-size: 14px; - list-style-image: none; - list-style-position: outside; - list-style-type: none; - border-left: 1px dotted #1E88E5; -} -header ul.secondNavigationArchive li { - display: list-item; - padding: 0 12px; - float: left; - margin: 0px; - transition: 0.2s; -} -header ul.secondNavigationArchive li a { - color: #E5E5E5; - line-height: 31px; -} -header ul.secondNavigationArchive li a.active { - color: #FFC700; -} -header ul.secondNavigationArchive li:hover { - border-bottom: 2px solid #FFC700; -} -header ul.secondNavigationArchive li.aactive { - border-bottom: 2px solid #FFC700; +header #secondNavigation ul.secondNavigation li.active a, header #secondNavigation ul.secondNavigation li:hover a, +header #secondNavigation ul.secondNavigationArchive li.active a, +header #secondNavigation ul.secondNavigationArchive li:hover a { + color: #1E88E5; } header div.breadcrumbs { display: none; } -footer { - height: 120px; - background-color: #eee; +footer#srv_footer { + display: flex; + justify-content: space-between; + box-sizing: border-box; + width: 100%; + height: 80px; + padding: 16px 40px; + margin-top: 40px; + font-size: 14px; + line-height: 16px; + color: #333333; + background-color: #FFFFFF; + border-top: 1px solid #E5E5E5; +} +footer#srv_footer a { + text-decoration: none; +} +footer#srv_footer .footer_left { + display: flex; + flex-direction: column; +} +footer#srv_footer .footer_left .footer_line { + display: flex; +} +footer#srv_footer .footer_left .footer_line:first-child { + margin-bottom: 15px; +} +footer#srv_footer .footer_left .footer_line .footer_item { + padding: 0 8px; + border-left: 1px #E5E5E5 solid; +} +footer#srv_footer .footer_left .footer_line .footer_item:first-child { + padding-left: 0; + border-left: none; +} +footer#srv_footer .footer_right { + text-align: left; +} +footer#srv_footer .footer_right span.faicon.inline_comment:before { + font-size: 14px !important; + margin-right: 3px; +} +footer#srv_footer .footer_right span.faicon.external_link:before { + font-size: 14px !important; + margin-right: 3px; } div.layout_left_item { diff --git a/resources/sass/admin_new/basic/basic.scss b/resources/sass/admin_new/basic/basic.scss index 3c70b46f4..9d4e1137d 100644 --- a/resources/sass/admin_new/basic/basic.scss +++ b/resources/sass/admin_new/basic/basic.scss @@ -9,6 +9,6 @@ @import "typography"; @import "layout"; @import "animations"; -@import "icons"; +@import "icons/icons"; @import "links"; @import "basic_classes"; diff --git a/resources/sass/admin_new/basic/colors.scss b/resources/sass/admin_new/basic/colors.scss index b57526fab..5e6b68ea0 100644 --- a/resources/sass/admin_new/basic/colors.scss +++ b/resources/sass/admin_new/basic/colors.scss @@ -11,6 +11,7 @@ $black: #333333; $white: #FFFFFF; $very-dark-gray: #777777; +$very-dark-gray2: #808080; $dark-gray: #C4C4C4; $gray: #E5E5E5; $light-gray: #F8F8F8; diff --git a/resources/sass/admin_new/basic/icons.scss b/resources/sass/admin_new/basic/icons.scss deleted file mode 100644 index de06089ef..000000000 --- a/resources/sass/admin_new/basic/icons.scss +++ /dev/null @@ -1,116 +0,0 @@ -span.faicon, -a.faicon{ - font-family: $fontawesome; - color: inherit; - display: inline-block; - font-weight: $heavy; - &.empty { - font-weight: $regular; - } - - &.link-right { - margin-right: 10px; - } - - &.link-left { - margin-left: 8px; - } - - //VELIKOSTI - - &.large { - font-size: 32px !important; - } - - &.medium { - font-size: 24px !important; - } - - &.normal { - font-size: 16px !important; - } - - &.small { - font-size: 10px !important; - } - - //BARVE - &.yellow { - color: $yellow; - } - &.blue { - color: $blue; - } - - //STACKING - &.fa-stack { - height: 1em; - line-height: 1em; - width: 1em; - } - - } - - -// Ključavnica -span.faicon.lock_open::before{ - content: "\f3c1"; -} -span.faicon.lock_close::before{ - content: "\f023"; -} - -// Zvone (notification) -span.faicon.bell::before{ - content: "\f0f3"; -} - -span.faicon.bell_slash::before{ - content: "\f1f6"; -} - -// Izbris (delete) -span.faicon.trash::before{ - content: "\f2ed"; -} - -// Kopiranje -span.faicon.copy::before{ - content: "\f0c5"; -} - -// Plus, minus, krogi -span.faicon.circle::before{ - content: "\f111"; -} - -span.faicon.plus::before{ - content: "\f067"; -} - -span.faicon.plus_circle::before{ - content: "\f055"; -} - -span.faicon.minus_circle::before{ - content: "\f056"; -} - -// Koledar -span.faicon.calendar_icon::before{ - content: "\f073"; -} - -//Wrapper (za ikone desno ob elementih) -div.icon_holder { - display: flex; - flex-direction: row; - box-sizing: border-box; - - align-items: center; - - span.faicon, - a.faicon{ - margin-left: 12px; - } -} \ No newline at end of file diff --git a/resources/sass/admin_new/basic/icons/analiza.scss b/resources/sass/admin_new/basic/icons/analiza.scss new file mode 100644 index 000000000..4ab155664 --- /dev/null +++ b/resources/sass/admin_new/basic/icons/analiza.scss @@ -0,0 +1,62 @@ +/* +To change this license header, choose License Headers in Project Properties. +To change this template file, choose Tools | Templates +and open the template in the editor. +*/ +/* + Created on : 10-Okt-2018 + Author : Peter Hrvatin +*/ + + +/* Analiza */ +span.faicon.an_sigma::before { + font-family: $font_family; + font-weight: 700; + content: "Σ"; + + vertical-align: middle; +} +span.faicon.an_sigmax::before { + font-family: $font_family; + font-weight: 700; + content: "Σ*"; + + vertical-align: middle; + margin-left: 3px; +} +span.faicon.an_freq::before { + font-family: $font_family; + font-weight: 700; + font-style: italic; + content: "f"; + + vertical-align: middle; + margin-left: 3px; +} +span.faicon.an_freqx::before { + font-family: $font_family; + font-weight: 700; + font-style: italic; + content: "f*"; + + vertical-align: middle; + margin-left: 3px; +} +span.faicon.an_stat::before { + font-family: $font_family; + font-weight: 700; + font-style: italic; + content: "s"; + + vertical-align: middle; + margin-left: 3px; +} +span.faicon.an_chart_bar::before { + font-size: 14px; + font-weight: 700; + /*content: "\f080";*/ + content: "\f200"; + + margin-left: 3px; +} diff --git a/resources/sass/admin_new/basic/icons/export.scss b/resources/sass/admin_new/basic/icons/export.scss new file mode 100644 index 000000000..a98915484 --- /dev/null +++ b/resources/sass/admin_new/basic/icons/export.scss @@ -0,0 +1,132 @@ +/* +To change this license header, choose License Headers in Project Properties. +To change this template file, choose Tools | Templates +and open the template in the editor. +*/ +/* + Created on : 8-Okt-2018 + Author : Peter Hrvatin +*/ + +/* Izvozi */ + +// PDF +span.faicon.pdf::before{ + font-size: 16px; + font-weight: 400; + content: "\f1c1"; + + color: #ed1c24; +} +span.faicon.pdf.black{ + color: $gray !important; + &:hover{ + color: #ed1c24 !important; + } +} +a:hover span.faicon.pdf.black{ + color: #ed1c24 !important; +} +span.faicon.pdf.black::before{ + color: inherit !important; +} + + +// XLS +span.faicon.xls::before{ + font-size: 16px; + font-weight: 400; + content: "\f1c3"; + + color: #008000; +} +span.faicon.xls.black{ + color: $gray !important; + &:hover{ + color: #008000 !important; + } +} +a:hover span.faicon.xls.black{ + color: #008000 !important; +} +span.faicon.xls.black::before{ + color: inherit !important; +} + + +// RTF +span.faicon.rtf::before{ + font-size: 16px; + font-weight: 400; + content: "\f1c2"; + + color: #0f3ea8; +} +span.faicon.rtf.black{ + color: $gray !important; + &:hover{ + color: #0f3ea8 !important; + } +} +a:hover span.faicon.rtf.black{ + color: #0f3ea8 !important; +} +span.faicon.rtf.black::before{ + color: inherit !important; +} + + +// PPT +span.faicon.ppt::before{ + font-size: 16px; + font-weight: 400; + content: "\f1c4"; + + color: #fa4913; +} +span.faicon.ppt.black{ + color: $gray !important; + &:hover{ + color: #fa4913 !important; + } +} +a:hover span.faicon.ppt.black{ + color: #fa4913 !important; +} +span.faicon.ppt.black::before{ + color: inherit !important; +} + + +// XML +span.faicon.xml::before{ + font-size: 16px; + font-weight: 400; + content: "\f1c9"; + + color: #00a000; +} +span.faicon.xml.black{ + color: $gray !important; + &:hover{ + color: #00a000 !important; + } +} +a:hover span.faicon.xml.black{ + color: #00a000 !important; +} +span.faicon.xml.black::before{ + color: inherit !important; +} + + +// Arhiv +span.faicon.arhiv::before{ + font-size: 16px; + content: "\f187"; +} +span.faicon.arhiv_mail::before{ + font-size: 16px; + font-weight: 400; + content: "\f14d"; +} diff --git a/resources/sass/admin_new/basic/icons/icons.scss b/resources/sass/admin_new/basic/icons/icons.scss new file mode 100644 index 000000000..c8cb8def3 --- /dev/null +++ b/resources/sass/admin_new/basic/icons/icons.scss @@ -0,0 +1,62 @@ +span.faicon, +a.faicon{ + font-family: $fontawesome; + color: inherit; + display: inline-block; + font-weight: $heavy; + + &.empty { + font-weight: $regular; + } + + &.link-right { + margin-right: 10px; + } + + &.link-left { + margin-left: 8px; + } + + //VELIKOSTI + &.large { + font-size: 32px !important; + } + + &.medium { + font-size: 24px !important; + } + + &.normal { + font-size: 16px !important; + } + + &.small { + font-size: 10px !important; + } + + //BARVE + &.yellow { + color: $yellow; + } + &.blue { + color: $blue; + } + + //STACKING + &.fa-stack { + height: 1em; + line-height: 1em; + width: 1em; + } +} + + +@import "radio"; +@import "standard"; +@import "modules"; +@import "toolbox"; +@import "question_edit"; +@import "library"; +@import "export"; +@import "analiza"; +@import "invitation"; diff --git a/resources/sass/admin_new/basic/icons/invitation.scss b/resources/sass/admin_new/basic/icons/invitation.scss new file mode 100644 index 000000000..8845bee16 --- /dev/null +++ b/resources/sass/admin_new/basic/icons/invitation.scss @@ -0,0 +1,44 @@ +/* +To change this license header, choose License Headers in Project Properties. +To change this template file, choose Tools | Templates +and open the template in the editor. +*/ +/* + Created on : 10-Okt-2018 + Author : Peter Hrvatin +*/ + + +/* Invitation table */ +span.faicon.inv_sent_0::before { + font-size: 14px; + content: "\f2b6"; + font-weight: 400; +} +span.faicon.inv_sent_1::before { + font-size: 14px; + content: "\f0e0"; +} +span.faicon.inv_responded_0::before { + font-size: 14px; + font-weight: 400; + content: "\f005"; +} +span.faicon.inv_responded_1::before { + font-size: 14px; + font-weight: 700; + content: "\f005"; +} +span.faicon.inv_unsubscribed_0::before { + font-size: 14px; + font-weight: 400; + content: "\f111"; +} +span.faicon.inv_unsubscribed_1::before { + font-size: 14px; + font-weight: 700; + content: "\f111"; + + color: $red; +} + diff --git a/resources/sass/admin_new/basic/icons/library.scss b/resources/sass/admin_new/basic/icons/library.scss new file mode 100644 index 000000000..ed9093210 --- /dev/null +++ b/resources/sass/admin_new/basic/icons/library.scss @@ -0,0 +1,41 @@ +/* +To change this license header, choose License Headers in Project Properties. +To change this template file, choose Tools | Templates +and open the template in the editor. +*/ +/* + Created on : 7-Okt-2018 + Author : Peter Hrvatin +*/ + +/* Knjiznica */ + +span.faicon.mapca.anketa::before{ + font-size: 16px; + font-weight: 400; + content: "\f022"; +} +span.faicon.table::before{ + font-size: 16px; + content: "\f00b"; +} +span.faicon.other_vprasanja::before{ + font-size: 16px; + content: "\f0ca" !important; +} +span.faicon.osnovna_vprasanja::before{ + font-size: 16px; + content: "\f0ca"; +} +span.faicon.mapca.if::before{ + font-family: $font_family; + font-weight: 500; + font-size: 16px; + content: "IF"; +} +span.faicon.mapca.b::before{ + font-family: $font_family; + font-weight: 500; + font-size: 16px; + content: "B"; +} diff --git a/resources/sass/admin_new/basic/icons/modules.scss b/resources/sass/admin_new/basic/icons/modules.scss new file mode 100644 index 000000000..4e7f53ea8 --- /dev/null +++ b/resources/sass/admin_new/basic/icons/modules.scss @@ -0,0 +1,125 @@ +/* +To change this license header, choose License Headers in Project Properties. +To change this template file, choose Tools | Templates +and open the template in the editor. +*/ +/* + Created on : 21-Sep-2018 + Author : Peter Hrvatin +*/ + +/* NAPREDNI MODULI */ + +span.module_icon{ + padding: 0 6px; + + color: white; + font-weight: 700; + font-size: 16px; + + background-color: transparent; + border: 1px $white solid; +} + +span.module_icon.maza::before{ + content: "MAZA"; +} +span.module_icon.wpn::before{ + content: "WPN"; +} +span.module_icon.panel::before{ + content: "Panel"; +} +span.module_icon.telephone::before{ + content: "TEL"; +} +span.module_icon.slideshow::before{ + content: "SS"; +} +span.module_icon.evalvation::before{ + content: "EVAL"; +} +span.module_icon.vnos::before{ + content: "V"; +} +span.module_icon.social::before{ + content: "SN"; +} +span.module_icon.quiz::before{ + content: "Q"; +} +span.module_icon.voting::before{ + content: "VOTE"; +} +span.module_icon.advanced_paradata::before{ + content: "AP"; +} +span.module_icon.chat::before{ + content: "C"; +} +span.module_icon.degrees_1ka::before{ + content: "360"; +} +span.module_icon.mju::before{ + content: "H"; +} +span.module_icon.sa-hierarhija::before{ + content: "SA"; +} + +span.module_icon.degrees::before{ + content: "360"; +} +span.module_icon.borza::before{ + content: "Borza"; +} +span.module_icon.evoli::before{ + content: "Evoli"; +} +span.module_icon.evoli_teammeter::before{ + content: "Evoli TM"; +} +span.module_icon.evoli_quality_climate::before{ + content: "Evoli QC"; +} +span.module_icon.evoli_teamship_meter::before{ + content: "Evoli TSM"; +} +span.module_icon.evoli_organizational_employeeship_meter::before{ + content: "Evoli OEM"; +} +span.module_icon.evoli_employmeter::before{ + content: "Evoli EM"; +} +span.module_icon.excell_matrix::before{ + content: "EM"; +} +span.module_icon.mfdps::before{ + content: "MFDPS"; +} +span.module_icon.mju::before{ + content: "MJU"; +} + +span.module_icon.gdpr{ + color: $gray; + background-color: $blue; + border: 1px $white solid; + + &:hover{ + color: $white; + } +} +span.module_icon.gdpr.active{ + color: white; + background-color: $blue; + border: 1px $white solid; + + &:hover{ + color: white; + border: 1px $white solid; + } +} +span.module_icon.gdpr::before{ + content: "GDPR"; +} \ No newline at end of file diff --git a/resources/sass/admin_new/basic/icons/question_edit.scss b/resources/sass/admin_new/basic/icons/question_edit.scss new file mode 100644 index 000000000..cb235bee6 --- /dev/null +++ b/resources/sass/admin_new/basic/icons/question_edit.scss @@ -0,0 +1,119 @@ +/* +To change this license header, choose License Headers in Project Properties. +To change this template file, choose Tools | Templates +and open the template in the editor. +*/ +/* + Created on : 21-Sep-2018 + Author : Peter Hrvatin +*/ + +/* question editing icons */ + +a.faicon{ + color: $blue !important; + &:hover{ + color: $dark-blue !important; + } +} + +span.faicon.edit-vprasanje{ + line-height: 25px; + + &:before{ + font-size: 18px; + content: "\f031"; + } +} + +a.faicon.edit::before{ + font-size: 16px; + content: "\f304"; +} +a.faicon.addif::before{ + font-family: Montserrat, sans-serif; + font-size: 18px; + font-weight: 900; + content: "IF"; +} +a.faicon.copy::before{ + font-size: 18px; + font-weight: 400; + content: "\f0c5"; +} +a.faicon.copycond::before{ + font-size: 18px; + content: "\f0c5"; +} +a.faicon.preview::before{ + @include icon_preview_before(); +} +a.faicon.preview::after{ + @include icon_preview_after(); +} +a.faicon.arhiv::before{ + font-size: 18px; + content: "\f044"; +} +a.faicon.delete::before{ + font-size: 18px; + font-weight: 400; + content: "\f2ed"; +} + +a.faicon.hide::before{ + font-size: 18px; + font-weight: 400; + content: "\f06e"; +} +a.faicon.unhide_icon::before{ + font-size: 18px; + font-weight: 400; + content: "\f070"; +} + +/* Urejanje vrednosti inline */ +.variabla span.inline.faicon::before{ + color: $blue; +} +.variabla span.inline.faicon:hover::before{ + color: $dark-blue; +} + +.variabla span.inline.faicon.edit2::before{ + font-size: 14px; + content: "\f304"; +} +.variabla span.inline.faicon.odg_hidden::before{ + font-size: 14px; + content: "\f05e"; +} +.variabla span.inline.faicon.odg_hidden.show-hidden::before{ + color: $red; +} +.variabla span.inline.faicon.odg_hidden.show-disable::before{ + color: $yellow; +} +.variabla span.inline.faicon.odg_if_not::before{ + font-family: Montserrat, sans-serif; + font-size: 15px; + font-weight: 900; + content: "IF*"; +} +.variabla span.inline.faicon.odg_if_follow::before{ + font-family: Montserrat, sans-serif; + font-size: 15px; + font-weight: 900; + content: "IF🠞"; +} +.variabla span.inline.faicon.correct::before{ + font-size: 14px; + font-weight: 900; + content: "\f00c"; +} + +.variabla span.inline.faicon.move_updown::before{ + font-size: 16px; + color: $dark-blue; + content: "\f338"; +} \ No newline at end of file diff --git a/resources/sass/admin_new/basic/icons/radio.scss b/resources/sass/admin_new/basic/icons/radio.scss new file mode 100644 index 000000000..017465901 --- /dev/null +++ b/resources/sass/admin_new/basic/icons/radio.scss @@ -0,0 +1,102 @@ +/* +To change this license header, choose License Headers in Project Properties. +To change this template file, choose Tools | Templates +and open the template in the editor. +*/ +/* + Created on : 21-Sep-2018 + Author : Peter Hrvatin +*/ + + +.enka-custom-radio{ + &::before { + letter-spacing: 10px; + color: $gray; + } + + &.star::before { + content: fa-content($fa-var-star); + } + &.thumb::before { + content: fa-content($fa-var-thumbs-up); + } + &.smiley::before { + content: fa-content($fa-var-smile); + } + &.heart::before { + content: fa-content($fa-var-heart); + } + &.flag::before { + content: fa-content($fa-var-flag); + } + &.user::before { + content: fa-content($fa-var-user); + } +} + + +/* visual analog scale - radio buttons */ +.enka-vizualna-skala { + &::before { + font-family: $fontawesome; + font-size: 20px; + letter-spacing: 10px; + color: $gray; + } + + // D; + &.siv-61::before, + &.siv-71::before{ + content: fa-content($fa-var-sad-tear); + } + + // D: + &.siv-41::before, + &.siv-51::before, + &.siv-62::before, + &.siv-72::before { + content: fa-content($fa-var-frown-open); + } + + // :( + &.siv-21::before, + &.siv-31::before, + &.siv-42::before, + &.siv-52::before, + &.siv-63::before, + &.siv-73::before { + content: fa-content($fa-var-frown); + } + + // :| + &.siv-32::before, + &.siv-53::before, + &.siv-74::before{ + content: fa-content($fa-var-meh); + } + + // :) + &.siv-22::before, + &.siv-33::before, + &.siv-43::before, + &.siv-54::before, + &.siv-64::before, + &.siv-75::before { + content: fa-content($fa-var-smile); + } + + // :D + &.siv-44::before, + &.siv-55::before, + &.siv-65::before, + &.siv-76::before { + content: fa-content($fa-var-grin); + } + + // ;D + &.siv-66::before, + &.siv-77::before{ + content: fa-content($fa-var-laugh-wink); + } +} diff --git a/resources/sass/admin_new/basic/icons/standard.scss b/resources/sass/admin_new/basic/icons/standard.scss new file mode 100644 index 000000000..cc25ff44b --- /dev/null +++ b/resources/sass/admin_new/basic/icons/standard.scss @@ -0,0 +1,612 @@ +/* +To change this license header, choose License Headers in Project Properties. +To change this template file, choose Tools | Templates +and open the template in the editor. +*/ +/* + Created on : 21-Sep-2018 + Author : Peter Hrvatin +*/ + +/* icons */ + +span.faicon.plus::before{ + content: "\f067"; +} +span.faicon.minus::before{ + content: "\f068"; +} + +span.faicon.close::before{ + font-size: 18px; + font-weight: 400; + content: "\f057"; +} +span.faicon.dropdown_blue::before{ + font-size: 16px; + content: "\f13a"; +} +span.faicon.dropup_blue::before{ + font-size: 16px; + content: "\f139"; +} +span.faicon.arrow_back::before{ + font-weight: 600; + font-size: 16px; + content: "\f137"; +} + +span.faicon.add::before{ + font-size: 18px; + content: "\f055"; +} + +span.faicon.remove::before{ + font-size: 18px; + content: "\f056"; +} + +span.faicon.delete::before{ + font-size: 18px; + font-weight: 400; + content: "\f2ed"; +} +span.faicon.anketa_delete::before{ + font-size: 24px; + font-weight: 400; + content: "\f2ed"; +} + +span.faicon.copy::before{ + font-size: 18px; + content: "\f0c5"; + font-weight: 400; +} +span.faicon.anketa_copy::before{ + font-size: 24px; + content: "\f0c5"; + font-weight: 400; +} + +span.faicon.export::before{ + font-size: 24px; + content: "\f56e"; +} + + + +/*span.faicon.import::before{ + font-size: 24px; + content: "\f56f"; +}*/ + +span.faicon.import{ + width: 32px; +} +span.faicon.import::before{ + font-size: 24px; + font-weight: 400; + content: "\f1c2"; +} +span.faicon.import::after{ + font-size: 14px; + content: "\f061"; + display: inline-block; +} + + + + +span.faicon.library::before{ + font-size: 24px; + content: "\f518"; +} + +span.faicon.folder::before{ + font-size: 22px; + content: "\f07b"; + vertical-align: middle; +} + +span.faicon.after.sort_down_arrow::after{ + content: "\f0d7"; + margin-left: 5px; +} +span.faicon.after.sort_up_arrow::after{ + content: "\f0d8"; + margin-left: 5px; +} + +span.faicon.info::before{ + font-size: 28px; + content: "\f05a"; + vertical-align: middle; +} + +span.faicon.pagination_left::before{ + margin: 0 1px 0 1px; + content: "\f104"; +} +span.faicon.pagination_right::before{ + margin: 0 0 0 1px; + content: "\f105"; +} + +span.faicon.edit::before{ + font-size: 16px; + content: "\f304"; +} + +span.faicon.refresh::before{ + font-size: 18px; + content: "\f2f1"; +} + +span.faicon.filter::before{ + font-size: 18px; + content: "\f0b0"; +} + +span.faicon.star::before, +span.faicon.star_off::before{ + font-size: 14px; + font-weight: 400; + content: "\f005"; +} +span.faicon.star_on::before{ + font-size: 14px; + font-weight: 700; + content: "\f005"; +} + +span.faicon.search::before{ + font-size: 20px; + content: "\f002"; +} +span.faicon.help2::before{ + font-size: 20px; + content: "\f059"; +} +span.faicon.user::before{ + font-size: 18px; + content: "\f007"; +} +span.faicon.logout::before{ + font-size: 20px; + content: "\f2f5"; +} + +span.faicon.monitor::before{ + font-size: 18px; + content: "\f108"; +} +span.faicon.users::before{ + font-size: 18px; + content: "\f500"; +} +span.faicon.lock_open::before{ + font-size: 18px; + content: "\f3c1"; +} +span.faicon.lock_close::before{ + font-size: 18px; + content: "\f023"; +} + +span.faicon.bottom_saving::before{ + font-size: 24px; + font-weight: 400; + content: "\f0c7"; +} +span.faicon.bottom_publish::before{ + font-size: 24px; + content: "\f093"; +} +span.faicon.bottom_preview{ + width: 20px; +} +span.faicon.bottom_preview::before{ + font-size: 24px; + font-weight: 400; + content: "\f15b"; +} +span.faicon.bottom_preview::after{ + font-size: 14px; + content: "\f002"; + display: inline-block; + margin-left: -70%; +} +span.faicon.bottom_test::before{ + font-size: 24px; + content: "\f492"; +} +span.faicon.language::before{ + font-size: 24px; + content: "\f0ac"; +} +span.faicon.mobile_off::before{ + font-size: 24px; + content: "\f3cd"; +} +span.faicon.mobile_off::after{ + font-size: 24px; + content: "\f715"; + margin-left: -23px; +} +span.faicon.comments::before{ + font-size: 24px; + content: "\f27a"; +} +span.faicon.comments_num::before{ + font-size: 24px; + content: "\f27a"; +} +span.faicon.comments_num { + strong { + color: white; + font-family: $font_family; + margin-top: -2px; + } +} +@mixin icon_link(){ + content: "\f0c1"; +} +span.faicon.data_link::before{ + font-size: 20px; + @include icon_link(); +} +span.faicon.data_link_small::before{ + font-size: 16px; + @include icon_link(); +} +@mixin icon_print(){ + content: "\f02f"; +} +span.faicon.print::before{ + font-size: 24px; + @include icon_print(); +} +span.faicon.print_small::before{ + font-size: 16px; + @include icon_print(); +} +@mixin icon_preview_before(){ + font-size: 18px; + font-weight: 400; + content: "\f15b"; +} +@mixin icon_preview_after(){ + content: "\f002"; + display: inline-block; + font-size: 11px; + margin-left: -50%; +} +span.faicon.preview{ + width: 18px; +} +span.faicon.preview::before{ + @include icon_preview_before(); +} +span.faicon.preview::after{ + @include icon_preview_after(); +} +span.faicon.palette::before{ + font-size: 18px; + content: "\f53f"; +} +span.faicon.inline_comment::before{ + font-size: 14px; + font-weight: 400; + content: "\f075"; +} +span.faicon.inline_double_comment::before{ + font-size: 14px; + font-weight: 400; + content: "\f086"; +} +span.faicon.comments_creport::before{ + font-size: 16px; + content: "\f086"; +} +span.faicon.compress::before{ + font-size: 15px; + content: "\f066"; +} +span.faicon.expand::before{ + font-size: 15px; + content: "\f065"; +} +span.faicon.hashtag::before{ + font-size: 15px; + content: "\f292"; +} +span.faicon.bug::before{ + font-size: 15px; + content: "\f188"; +} +span.faicon.paragraph::before{ + font-size: 15px; + content: "\f1dd"; +} +span.faicon.replace::before{ + font-size: 15px; + content: "\f362"; +} +span.faicon.plus_square::before{ + font-size: 15px; + font-weight: 400; + content: "\f0fe"; +} +span.faicon.minus_square::before{ + font-size: 15px; + font-weight: 400; + content: "\f146"; +} +span.faicon.delete_circle::before{ + font-size: 14px; + content: "\f056"; +} +span.faicon.quick_view::before{ + font-size: 15px; + font-weight: 400; + content: "\f06e"; +} +span.faicon.edit_square::before{ + font-size: 15px; + content: "\f044"; +} +span.faicon.test::before{ + font-size: 15px; + content: "\f492"; +} +@mixin icon_if_add() { + font-size: 12px; + font-family: $font_family; + font-weight: 400; + &:before{ + background-color: $blue; + font-weight: 500; + padding: 2px 4px; + color: white; + content: "IF"; + } + &:hover{ + &:before{ + background-color: $dark-blue; + } + } +} +a.faicon.if_add{ + @include icon_if_add(); +} +span.faicon.if_add{ + @include icon_if_add(); +} +span.faicon.text_file::before{ + font-size: 24px; + font-weight: 400; + content: "\f15c"; +} +span.faicon.text_file_small { + height: 20px; + vertical-align: middle; + &:before{ + font-size: 18px; + font-weight: 400; + content: "\f15c"; + } +} +span.faicon.warning::before{ + font-size: 16px; + content: "\f071"; +} +span.faicon.users_small::before{ + font-size: 16px; + content: "\f0c0"; +} + +span.faicon.popup_0::before{ + font-size: 14px; + content: "\f065"; + color: $blue; +} +span.faicon.popup_1::before{ + font-size: 14px; + content: "\f065"; + color: $dark-blue; +} +span.faicon.flat_0::before{ + font-size: 14px; + content: "\f03c"; + color: $dark-blue; +} +span.faicon.flat_1::before{ + font-size: 14px; + content: "\f03c"; + color: $blue; +} +span.basic-icon.spss::before{ + content: "Σ"; + line-height: 26px; + + vertical-align: bottom; + font-size: 30px !important; + font-weight: bold; +} + +span.faicon.external_link::before{ + font-size: 14px; + font-weight: 600; + content: "\f35d"; +} +span.faicon.cog_large::before{ + font-size: 34px; + font-weight: 600; + content: "\f013"; +} +span.faicon.chart_large::before{ + font-size: 34px; + font-weight: 600; + content: "\f201"; +} +span.faicon.reload_large::before{ + font-size: 34px; + font-weight: 600; + content: "\f021"; +} + + +/* CALENDAR */ +span.faicon.calendar_icon::before, +button.ui-datepicker-trigger::before{ + font-family: $fontawesome; + font-weight: 400; + font-size: 16px; + content: "\f073"; +} + +/* ARROWS */ +span.faicon.arrow_up::before{ + font-size: 14px; + content: "\f062"; + color: $gray; +} +span.faicon.arrow2_r::before{ + font-size: 14px; + content: "\f054"; +} +span.faicon.arrow2_l::before{ + font-size: 14px; + content: "\f053"; +} +span.faicon.arrow2_d::before{ + font-size: 14px; + content: "\f078"; +} +span.faicon.arrow2_u::before{ + font-size: 14px; + content: "\f077"; +} + +span.faicon.arrow_large2_r::before{ + font-size: 35px; + content: "\f054"; +} +span.faicon.arrow_large2_l::before{ + font-size: 35px; + content: "\f053"; +} + +span.faicon.arrow_verylarge2_r::before{ + font-size: 40px; + content: "\f054"; +} +span.faicon.arrow_verylarge2_l::before{ + font-size: 40px; + content: "\f053"; +} + +span.faicon.sort_descending::before{ + font-size: 14px; + content: "\f0d7"; +} +span.faicon.sort_ascending::before{ + font-size: 14px; + content: "\f0d8"; +} + + +/* Plus/minus sqare */ +span.folder_plusminus { + text-indent: 0px !important; + font-style: normal !important; +} +span.faicon.plus_orange::before{ + font-size: 12px; + font-weight: 400; + content: "\f0fe"; +} +span.faicon.minus_orange::before{ + font-size: 12px; + font-weight: 400; + content: "\f146"; +} + + +/* Spinner */ +span.faicon.spinner::before{ + font-size: 18px; + content: "\f110"; +} + + +/* Bars - mobile menu */ +span.faicon.bars::before{ + font-size: 26px; + content: "\f0c9"; +} + + + +// Ključavnica +span.faicon.lock_open::before{ + content: "\f3c1"; +} +span.faicon.lock_close::before{ + content: "\f023"; +} + +// Zvone (notification) +span.faicon.bell::before{ + content: "\f0f3"; +} + +span.faicon.bell_slash::before{ + content: "\f1f6"; +} + +// Izbris (delete) +span.faicon.trash::before{ + content: "\f2ed"; +} + +// Kopiranje +span.faicon.copy::before{ + content: "\f0c5"; +} + +// Plus, minus, krogi +span.faicon.circle::before{ + content: "\f111"; +} + +span.faicon.plus::before{ + content: "\f067"; +} + +span.faicon.plus_circle::before{ + content: "\f055"; +} + +span.faicon.minus_circle::before{ + content: "\f056"; +} + +// Koledar +span.faicon.calendar_icon::before{ + content: "\f073"; +} + +//Wrapper (za ikone desno ob elementih) +div.icon_holder { + display: flex; + flex-direction: row; + box-sizing: border-box; + + align-items: center; + + span.faicon, + a.faicon{ + margin-left: 12px; + } +} diff --git a/resources/sass/admin_new/basic/icons/toolbox.scss b/resources/sass/admin_new/basic/icons/toolbox.scss new file mode 100644 index 000000000..995ce6558 --- /dev/null +++ b/resources/sass/admin_new/basic/icons/toolbox.scss @@ -0,0 +1,75 @@ +/* +To change this license header, choose License Headers in Project Properties. +To change this template file, choose Tools | Templates +and open the template in the editor. +*/ +/* + Created on : 21-Sep-2018 + Author : Peter Hrvatin +*/ + +/* Toolbox na levi strani */ + +span.faicon.wheel_32::before{ + content: "\f013"; + font-size: 20px; +} + +span.faicon.radio_32::before{ + content: "\f192"; + font-weight: 400; + font-size: 18px; +} + +span.faicon.check_32::before{ + content: "\f14a"; + font-weight: 400; + font-size: 18px; +} + +span.faicon.matrix_32::before{ + content: "\f192 \f192\A\f192 \f192"; + white-space: pre; + font-weight: 400; + font-size: 12px; +} + +span.faicon.abc_32::before{ + content: "ABC"; + font-family: $font_family; + font-size: 16px; +} + +span.faicon.number_32::before{ + content: "123"; + font-family: $font_family; + font-size: 16px; +} + +span.faicon.nagovor::before{ + content: "T"; + font-size: 18px; +} + +span.faicon.plus_32::before{ + content: "\f055"; + font-size: 18px; +} + +span.faicon.if_32::before{ + content: "IF"; + font-family: $font_family; + font-size: 16px; +} + +span.faicon.block_32::before{ + content: "B"; + font-family: $font_family; + font-size: 16px; +} + +span.faicon.loop_32::before{ + content: "L"; + font-family: $font_family; + font-size: 15px; +} \ No newline at end of file diff --git a/resources/sass/admin_new/components/footer/footer.scss b/resources/sass/admin_new/components/footer/footer.scss index 0e582d7a0..32047f63f 100644 --- a/resources/sass/admin_new/components/footer/footer.scss +++ b/resources/sass/admin_new/components/footer/footer.scss @@ -1,5 +1,58 @@ -footer{ - height: 120px; +footer#srv_footer{ + display: flex; + justify-content: space-between; + box-sizing: border-box; - background-color: #eee; -} \ No newline at end of file + width: 100%; + height: 80px; + padding: 16px 40px; + margin-top: 40px; + + font-size: 14px; + line-height: 16px; + color: $black; + + background-color: $white; + border-top: 1px solid $gray; + + a{ + text-decoration: none; + } + + .footer_left{ + display: flex; + flex-direction: column; + + .footer_line{ + display: flex; + + &:first-child{ + margin-bottom: 15px; + } + + .footer_item{ + padding: 0 8px; + border-left: 1px $gray solid; + + &:first-child{ + padding-left: 0; + border-left: none; + } + } + } + } + + .footer_right{ + text-align: left; + + span.faicon.inline_comment:before{ + font-size: 14px !important; + margin-right: 3px; + } + + span.faicon.external_link:before{ + font-size: 14px !important; + margin-right: 3px; + } + } +} diff --git a/resources/sass/admin_new/components/header/navigation.scss b/resources/sass/admin_new/components/header/navigation.scss index ca9f272f0..9649fc708 100644 --- a/resources/sass/admin_new/components/header/navigation.scss +++ b/resources/sass/admin_new/components/header/navigation.scss @@ -15,35 +15,46 @@ header{ display: flex; height: 50px; - width: 100%; padding-top: 10px; + margin-left: 32px; font-size: 16px; font-weight: 400; text-align: center; - #mojeAnketeLink { - a { - color: $white; - text-decoration: none; - } - } - - ol { + ol{ display: flex; - - li { + padding: 0; + margin: 0; + + li{ list-style-image: none; list-style-position: outside; list-style-type: none; + } + + &.navigation_buttons_list li{ + padding: 14px 32px; a { color: $white; text-decoration: none; } + + &.active_on{ + background-color: $white; + + a { + color: $blue; + } + } + + #mojeAnketeLink { + + } } - } + } } } @@ -93,180 +104,53 @@ header{ #secondNavigation { - display: block; - z-index: 1; - left: 0px; - right: 0px; - padding: 8px 20px 0 145px; - height: 33px; - border-bottom: 1px solid $blue; - background-color: $second_navigation_background; - } + display: flex; - ul.secondNavigation { - display: inline-block; - float: left; - width: auto; - margin-top: 1px !important; - margin-bottom: 0; - } + height: 41px; - .secondNavigation { - display: inline-block; - list-style-image: none; - list-style-position: outside; - list-style-type: none; - padding: 0px; - width: 100%; - li { - display: list-item; - float: left; - padding: 0px; - margin: 0px; - } - .blank { - height: 12px; - width: 6px; - } - .no-img { - padding: 0px 12px !important; - background-image: none !important; - } - a { - display: block; - line-height: 30px; - font-size: 14px; - color: $second_navigation_text; - - &:hover { - border-bottom: 2px solid $yellow; - } - } - a.active { - color: $yellow; - background-color: inherit; - border-bottom: 2px solid $yellow; - } - .side-left { - padding-left: 10px; - } - .side-right { - padding-right: 12px; - } - .space { - width: 20px; - height: 19px; - padding: 0px; - } - .single { - padding: 0px 12px 0px 24px¸; - &:hover { - text-shadow: 0px 1px 0px #fff; - } - &:active { - color: $gray; - } - } - } + border-bottom: 1px solid $gray; - #secondNavigation.library { - padding-left: 35px; - a { - font-size: 14px; - } - ul.secondNavigation { - .space { - width: 25px; - } - } - } + ul.secondNavigation, + ul.secondNavigationArchive{ + display: flex; + align-items: center; - #secondNavigation_links { - position: relative; - float: right; - width: auto; - margin-top: -7px; - line-height: 38px; - z-index: 2; - text-align: right; - #hover_export { - display: none; - position: absolute; - z-index: 99999; - right: 10px; - top: 39px; - padding: 5px 0 5px 13px; - width: 180px; - text-align: left; - line-height: normal; - background-color: $second_navigation_background; - border: 1px $blue solid; - -webkit-box-shadow: 0 5px 15px 0 rgba(0,0,0,0.4); - box-shadow: 0 5px 15px 0 rgba(0,0,0,0.4); - -moz-box-shadow: 0 5px 15px 0 rgba(0,0,0,0.4); - a { - display: block; - padding: 6px 0; - color: $export_dropdown_text; - font-size: 14px; - - transition: 0.2s; - - &:hover { - color: $yellow; + margin: 0 0 0 32px; + padding: 0; + + li{ + list-style-image: none; + list-style-position: outside; + list-style-type: none; + + height: 41px; + + border-bottom: 1px $gray solid; + + a { + padding: 12px 32px; + + line-height: 41px; + font-size: 15px; + color: $very-dark-gray2; + text-decoration: none; + } + + &.active, + &:hover{ + border-bottom: 1px $blue solid; + + a{ + color: $blue; + } } } - span.hover_export_icon { - display: inline-block; - width: 40px; - } } } - ul.secondNavigationArchive { - display: inline-block; - float: left; - width: auto; - padding: 0px; - margin: 0 0 0 10px !important; - padding-left: 23px; - padding-top: 0px; - - font-size: 14px; - list-style-image: none; - list-style-position: outside; - list-style-type: none; - - border-left: 1px dotted $blue; - - li { - display: list-item; - padding: 0 12px; - float: left; - margin: 0px; - - transition: 0.2s; - a { - color: $second_navigation_text; - line-height: 31px; - } - a.active { - color: $yellow; - } - &:hover { - border-bottom: 2px solid $yellow; - } - } - li.aactive{ - border-bottom: 2px solid $yellow; - } - } - - // skrijemo breadcrumbs na desktopu div.breadcrumbs { display: none; } - } diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index 122f51264..14d0a44b4 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -19,6 +19,7 @@ return array( 'ApiController' => $baseDir . '/admin/survey/api/class.ApiController.php', 'ApiNarocilaController' => $baseDir . '/frontend/payments/classes/class.ApiNarocilaController.php', 'ApiSurvey' => $baseDir . '/admin/survey/api/class.ApiSurvey.php', + 'AppSettings' => $baseDir . '/admin/survey/classes/class.AppSettings.php', 'App\\Controllers\\AjaxController' => $baseDir . '/main/survey/app/Controllers/AjaxController.php', 'App\\Controllers\\BodyController' => $baseDir . '/main/survey/app/Controllers/BodyController.php', 'App\\Controllers\\CheckController' => $baseDir . '/main/survey/app/Controllers/CheckController.php', @@ -855,6 +856,7 @@ return array( 'Stripe\\Service\\ReviewService' => $vendorDir . '/stripe/stripe-php/lib/Service/ReviewService.php', 'Stripe\\Service\\SetupAttemptService' => $vendorDir . '/stripe/stripe-php/lib/Service/SetupAttemptService.php', 'Stripe\\Service\\SetupIntentService' => $vendorDir . '/stripe/stripe-php/lib/Service/SetupIntentService.php', + 'Stripe\\Service\\ShippingRateService' => $vendorDir . '/stripe/stripe-php/lib/Service/ShippingRateService.php', 'Stripe\\Service\\Sigma\\ScheduledQueryRunService' => $vendorDir . '/stripe/stripe-php/lib/Service/Sigma/ScheduledQueryRunService.php', 'Stripe\\Service\\Sigma\\SigmaServiceFactory' => $vendorDir . '/stripe/stripe-php/lib/Service/Sigma/SigmaServiceFactory.php', 'Stripe\\Service\\SkuService' => $vendorDir . '/stripe/stripe-php/lib/Service/SkuService.php', @@ -874,6 +876,7 @@ return array( 'Stripe\\Service\\WebhookEndpointService' => $vendorDir . '/stripe/stripe-php/lib/Service/WebhookEndpointService.php', 'Stripe\\SetupAttempt' => $vendorDir . '/stripe/stripe-php/lib/SetupAttempt.php', 'Stripe\\SetupIntent' => $vendorDir . '/stripe/stripe-php/lib/SetupIntent.php', + 'Stripe\\ShippingRate' => $vendorDir . '/stripe/stripe-php/lib/ShippingRate.php', 'Stripe\\Sigma\\ScheduledQueryRun' => $vendorDir . '/stripe/stripe-php/lib/Sigma/ScheduledQueryRun.php', 'Stripe\\SingletonApiResource' => $vendorDir . '/stripe/stripe-php/lib/SingletonApiResource.php', 'Stripe\\Source' => $vendorDir . '/stripe/stripe-php/lib/Source.php', diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index 3e5a8368b..ed99a1d42 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -223,6 +223,7 @@ class ComposerStaticInit6b03163c371c5541881b55b762b8c779 'ApiController' => __DIR__ . '/../..' . '/admin/survey/api/class.ApiController.php', 'ApiNarocilaController' => __DIR__ . '/../..' . '/frontend/payments/classes/class.ApiNarocilaController.php', 'ApiSurvey' => __DIR__ . '/../..' . '/admin/survey/api/class.ApiSurvey.php', + 'AppSettings' => __DIR__ . '/../..' . '/admin/survey/classes/class.AppSettings.php', 'App\\Controllers\\AjaxController' => __DIR__ . '/../..' . '/main/survey/app/Controllers/AjaxController.php', 'App\\Controllers\\BodyController' => __DIR__ . '/../..' . '/main/survey/app/Controllers/BodyController.php', 'App\\Controllers\\CheckController' => __DIR__ . '/../..' . '/main/survey/app/Controllers/CheckController.php', @@ -1059,6 +1060,7 @@ class ComposerStaticInit6b03163c371c5541881b55b762b8c779 'Stripe\\Service\\ReviewService' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/ReviewService.php', 'Stripe\\Service\\SetupAttemptService' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/SetupAttemptService.php', 'Stripe\\Service\\SetupIntentService' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/SetupIntentService.php', + 'Stripe\\Service\\ShippingRateService' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/ShippingRateService.php', 'Stripe\\Service\\Sigma\\ScheduledQueryRunService' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/Sigma/ScheduledQueryRunService.php', 'Stripe\\Service\\Sigma\\SigmaServiceFactory' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/Sigma/SigmaServiceFactory.php', 'Stripe\\Service\\SkuService' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/SkuService.php', @@ -1078,6 +1080,7 @@ class ComposerStaticInit6b03163c371c5541881b55b762b8c779 'Stripe\\Service\\WebhookEndpointService' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Service/WebhookEndpointService.php', 'Stripe\\SetupAttempt' => __DIR__ . '/..' . '/stripe/stripe-php/lib/SetupAttempt.php', 'Stripe\\SetupIntent' => __DIR__ . '/..' . '/stripe/stripe-php/lib/SetupIntent.php', + 'Stripe\\ShippingRate' => __DIR__ . '/..' . '/stripe/stripe-php/lib/ShippingRate.php', 'Stripe\\Sigma\\ScheduledQueryRun' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Sigma/ScheduledQueryRun.php', 'Stripe\\SingletonApiResource' => __DIR__ . '/..' . '/stripe/stripe-php/lib/SingletonApiResource.php', 'Stripe\\Source' => __DIR__ . '/..' . '/stripe/stripe-php/lib/Source.php', diff --git a/vendor/composer/ca-bundle/composer.json b/vendor/composer/ca-bundle/composer.json index 5213e9763..ed6a1b364 100644 --- a/vendor/composer/ca-bundle/composer.json +++ b/vendor/composer/ca-bundle/composer.json @@ -30,7 +30,7 @@ "symfony/phpunit-bridge": "^4.2 || ^5", "phpstan/phpstan": "^0.12.55", "psr/log": "^1.0", - "symfony/process": "^2.5 || ^3.0 || ^4.0 || ^5.0" + "symfony/process": "^2.5 || ^3.0 || ^4.0 || ^5.0 || ^6.0" }, "autoload": { "psr-4": { diff --git a/vendor/composer/ca-bundle/res/cacert.pem b/vendor/composer/ca-bundle/res/cacert.pem index 264923b3e..0bf312fe5 100644 --- a/vendor/composer/ca-bundle/res/cacert.pem +++ b/vendor/composer/ca-bundle/res/cacert.pem @@ -1,7 +1,7 @@ ## ## Bundle of CA Root Certificates ## -## Certificate data from Mozilla as of: Tue May 25 03:12:05 2021 GMT +## Certificate data from Mozilla as of: Tue Oct 26 03:12:05 2021 GMT ## ## This is a bundle of X.509 certificates of public Certificate Authorities ## (CA). These were automatically extracted from Mozilla's root certificates @@ -14,7 +14,7 @@ ## Just configure this file as the SSLCACertificateFile. ## ## Conversion done with mk-ca-bundle.pl version 1.28. -## SHA256: e292bd4e2d500c86df45b830d89417be5c42ee670408f1d2c454c63d8a782865 +## SHA256: bb36818a81feaa4cca61101e6d6276cd09e972efcb08112dfed846918ca41d7f ## @@ -156,38 +156,6 @@ Rt0vxuBqw8M0Ayx9lt1awg6nCpnBBYurDC/zXDrPbDdVCYfeU0BsWO/8tqtlbgT2G9w84FoVxp7Z 12yxow+ev+to51byrvLjKzg6CYG1a4XXvi3tPxq3smPi9WIsgtRqAEFQ8TmDn5XpNpaYbg== -----END CERTIFICATE----- -QuoVadis Root CA -================ ------BEGIN CERTIFICATE----- -MIIF0DCCBLigAwIBAgIEOrZQizANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJCTTEZMBcGA1UE -ChMQUXVvVmFkaXMgTGltaXRlZDElMCMGA1UECxMcUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0 -eTEuMCwGA1UEAxMlUXVvVmFkaXMgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wMTAz -MTkxODMzMzNaFw0yMTAzMTcxODMzMzNaMH8xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRp -cyBMaW1pdGVkMSUwIwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYDVQQD -EyVRdW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEF -AAOCAQ8AMIIBCgKCAQEAv2G1lVO6V/z68mcLOhrfEYBklbTRvM16z/Ypli4kVEAkOPcahdxYTMuk -J0KX0J+DisPkBgNbAKVRHnAEdOLB1Dqr1607BxgFjv2DrOpm2RgbaIr1VxqYuvXtdj182d6UajtL -F8HVj71lODqV0D1VNk7feVcxKh7YWWVJWCCYfqtffp/p1k3sg3Spx2zY7ilKhSoGFPlU5tPaZQeL -YzcS19Dsw3sgQUSj7cugF+FxZc4dZjH3dgEZyH0DWLaVSR2mEiboxgx24ONmy+pdpibu5cxfvWen -AScOospUxbF6lR1xHkopigPcakXBpBlebzbNw6Kwt/5cOOJSvPhEQ+aQuwIDAQABo4ICUjCCAk4w -PQYIKwYBBQUHAQEEMTAvMC0GCCsGAQUFBzABhiFodHRwczovL29jc3AucXVvdmFkaXNvZmZzaG9y -ZS5jb20wDwYDVR0TAQH/BAUwAwEB/zCCARoGA1UdIASCAREwggENMIIBCQYJKwYBBAG+WAABMIH7 -MIHUBggrBgEFBQcCAjCBxxqBxFJlbGlhbmNlIG9uIHRoZSBRdW9WYWRpcyBSb290IENlcnRpZmlj -YXRlIGJ5IGFueSBwYXJ0eSBhc3N1bWVzIGFjY2VwdGFuY2Ugb2YgdGhlIHRoZW4gYXBwbGljYWJs -ZSBzdGFuZGFyZCB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZiB1c2UsIGNlcnRpZmljYXRpb24gcHJh -Y3RpY2VzLCBhbmQgdGhlIFF1b1ZhZGlzIENlcnRpZmljYXRlIFBvbGljeS4wIgYIKwYBBQUHAgEW -Fmh0dHA6Ly93d3cucXVvdmFkaXMuYm0wHQYDVR0OBBYEFItLbe3TKbkGGew5Oanwl4Rqy+/fMIGu -BgNVHSMEgaYwgaOAFItLbe3TKbkGGew5Oanwl4Rqy+/foYGEpIGBMH8xCzAJBgNVBAYTAkJNMRkw -FwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMSUwIwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0 -aG9yaXR5MS4wLAYDVQQDEyVRdW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggQ6 -tlCLMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAitQUtf70mpKnGdSkfnIYj9lo -fFIk3WdvOXrEql494liwTXCYhGHoG+NpGA7O+0dQoE7/8CQfvbLO9Sf87C9TqnN7Az10buYWnuul -LsS/VidQK2K6vkscPFVcQR0kvoIgR13VRH56FmjffU1RcHhXHTMe/QKZnAzNCgVPx7uOpHX6Sm2x -gI4JVrmcGmD+XcHXetwReNDWXcG31a0ymQM6isxUJTkxgXsTIlG6Rmyhu576BGxJJnSP0nPrzDCi -5upZIof4l/UO/erMkqQWxFIY6iHOsfHmhIHluqmGKPJDWl0Snawe2ajlCmqnf6CHKc/yiU3U7MXi -5nrQNiOKSnQ2+Q== ------END CERTIFICATE----- - QuoVadis Root CA 2 ================== -----BEGIN CERTIFICATE----- @@ -275,26 +243,6 @@ s58+OmJYxUmtYg5xpTKqL8aJdkNAExNnPaJUJRDL8Try2frbSVa7pv6nQTXD4IhhyYjH3zYQIphZ FL39vmwLAw== -----END CERTIFICATE----- -Sonera Class 2 Root CA -====================== ------BEGIN CERTIFICATE----- -MIIDIDCCAgigAwIBAgIBHTANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJGSTEPMA0GA1UEChMG -U29uZXJhMRkwFwYDVQQDExBTb25lcmEgQ2xhc3MyIENBMB4XDTAxMDQwNjA3Mjk0MFoXDTIxMDQw -NjA3Mjk0MFowOTELMAkGA1UEBhMCRkkxDzANBgNVBAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJh -IENsYXNzMiBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJAXSjWdyvANlsdE+hY3 -/Ei9vX+ALTU74W+oZ6m/AxxNjG8yR9VBaKQTBME1DJqEQ/xcHf+Js+gXGM2RX/uJ4+q/Tl18GybT -dXnt5oTjV+WtKcT0OijnpXuENmmz/V52vaMtmdOQTiMofRhj8VQ7Jp12W5dCsv+u8E7s3TmVToMG -f+dJQMjFAbJUWmYdPfz56TwKnoG4cPABi+QjVHzIrviQHgCWctRUz2EjvOr7nQKV0ba5cTppCD8P -tOFCx4j1P5iop7oc4HFx71hXgVB6XGt0Rg6DA5jDjqhu8nYybieDwnPz3BjotJPqdURrBGAgcVeH -nfO+oJAjPYok4doh28MCAwEAAaMzMDEwDwYDVR0TAQH/BAUwAwEB/zARBgNVHQ4ECgQISqCqWITT -XjwwCwYDVR0PBAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQBazof5FnIVV0sd2ZvnoiYw7JNn39Yt -0jSv9zilzqsWuasvfDXLrNAPtEwr/IDva4yRXzZ299uzGxnq9LIR/WFxRL8oszodv7ND6J+/3DEI -cbCdjdY0RzKQxmUk96BKfARzjzlvF4xytb1LyHr4e4PDKE6cCepnP7JnBBvDFNr450kkkdAdavph -Oe9r5yF1BgfYErQhIHBCcYHaPJo2vqZbDWpsmh+Re/n570K6Tk6ezAyNlNzZRZxe7EJQY670XcSx -EtzKO6gunRRaBXW37Ndj4ro1tgQIkejanZz2ZrUYrAqmVCY0M9IbwdR/GjqOC6oybtv8TyWf2TLH -llpwrN9M ------END CERTIFICATE----- - XRamp Global CA Root ==================== -----BEGIN CERTIFICATE----- @@ -433,26 +381,6 @@ mNEVX58Svnw2Yzi9RKR/5CYrCsSXaQ3pjOLAEFe4yHYSkVXySGnYvCoCWw9E1CAx2/S6cCZdkGCe vEsXCS+0yx5DaMkHJ8HSXPfqIbloEpw8nL+e/IBcm2PN7EeqJSdnoDfzAIJ9VNep+OkuE6N36B9K -----END CERTIFICATE----- -DST Root CA X3 -============== ------BEGIN CERTIFICATE----- -MIIDSjCCAjKgAwIBAgIQRK+wgNajJ7qJMDmGLvhAazANBgkqhkiG9w0BAQUFADA/MSQwIgYDVQQK -ExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMTDkRTVCBSb290IENBIFgzMB4X -DTAwMDkzMDIxMTIxOVoXDTIxMDkzMDE0MDExNVowPzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1 -cmUgVHJ1c3QgQ28uMRcwFQYDVQQDEw5EU1QgUm9vdCBDQSBYMzCCASIwDQYJKoZIhvcNAQEBBQAD -ggEPADCCAQoCggEBAN+v6ZdQCINXtMxiZfaQguzH0yxrMMpb7NnDfcdAwRgUi+DoM3ZJKuM/IUmT -rE4Orz5Iy2Xu/NMhD2XSKtkyj4zl93ewEnu1lcCJo6m67XMuegwGMoOifooUMM0RoOEqOLl5CjH9 -UL2AZd+3UWODyOKIYepLYYHsUmu5ouJLGiifSKOeDNoJjj4XLh7dIN9bxiqKqy69cK3FCxolkHRy -xXtqqzTWMIn/5WgTe1QLyNau7Fqckh49ZLOMxt+/yUFw7BZy1SbsOFU5Q9D8/RhcQPGX69Wam40d -utolucbY38EVAjqr2m7xPi71XAicPNaDaeQQmxkqtilX4+U9m5/wAl0CAwEAAaNCMEAwDwYDVR0T -AQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMSnsaR7LHH62+FLkHX/xBVghYkQ -MA0GCSqGSIb3DQEBBQUAA4IBAQCjGiybFwBcqR7uKGY3Or+Dxz9LwwmglSBd49lZRNI+DT69ikug -dB/OEIKcdBodfpga3csTS7MgROSR6cz8faXbauX+5v3gTt23ADq1cEmv8uXrAvHRAosZy5Q6XkjE -GB5YGV8eAlrwDPGxrancWYaLbumR9YbK+rlmM6pZW87ipxZzR8srzJmwN0jP41ZL9c8PDHIyh8bw -RLtTcm1D9SZImlJnt1ir/md2cXjbDaJWFBM5JDGFoqgCWjBH4d1QB7wCCZAA62RjYJsWvIjJEubS -fZGL+T0yjWW06XyxV3bqxbYoOb8VZRzI9neWagqNdwvYkQsEjgfbKbYK7p2CNTUQ ------END CERTIFICATE----- - SwissSign Gold CA - G2 ====================== -----BEGIN CERTIFICATE----- @@ -1194,27 +1122,6 @@ OR/qnuOf0GZvBeyqdn6/axag67XH/JJULysRJyU3eExRarDzzFhdFPFqSBX/wge2sY0PjlxQRrM9 vwGYT7JZVEc+NHt4bVaTLnPqZih4zR0Uv6CPLy64Lo7yFIrM6bV8+2ydDKXhlg== -----END CERTIFICATE----- -Trustis FPS Root CA -=================== ------BEGIN CERTIFICATE----- -MIIDZzCCAk+gAwIBAgIQGx+ttiD5JNM2a/fH8YygWTANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQG -EwJHQjEYMBYGA1UEChMPVHJ1c3RpcyBMaW1pdGVkMRwwGgYDVQQLExNUcnVzdGlzIEZQUyBSb290 -IENBMB4XDTAzMTIyMzEyMTQwNloXDTI0MDEyMTExMzY1NFowRTELMAkGA1UEBhMCR0IxGDAWBgNV -BAoTD1RydXN0aXMgTGltaXRlZDEcMBoGA1UECxMTVHJ1c3RpcyBGUFMgUm9vdCBDQTCCASIwDQYJ -KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMVQe547NdDfxIzNjpvto8A2mfRC6qc+gIMPpqdZh8mQ -RUN+AOqGeSoDvT03mYlmt+WKVoaTnGhLaASMk5MCPjDSNzoiYYkchU59j9WvezX2fihHiTHcDnlk -H5nSW7r+f2C/revnPDgpai/lkQtV/+xvWNUtyd5MZnGPDNcE2gfmHhjjvSkCqPoc4Vu5g6hBSLwa -cY3nYuUtsuvffM/bq1rKMfFMIvMFE/eC+XN5DL7XSxzA0RU8k0Fk0ea+IxciAIleH2ulrG6nS4zt -o3Lmr2NNL4XSFDWaLk6M6jKYKIahkQlBOrTh4/L68MkKokHdqeMDx4gVOxzUGpTXn2RZEm0CAwEA -AaNTMFEwDwYDVR0TAQH/BAUwAwEB/zAfBgNVHSMEGDAWgBS6+nEleYtXQSUhhgtx67JkDoshZzAd -BgNVHQ4EFgQUuvpxJXmLV0ElIYYLceuyZA6LIWcwDQYJKoZIhvcNAQEFBQADggEBAH5Y//01GX2c -GE+esCu8jowU/yyg2kdbw++BLa8F6nRIW/M+TgfHbcWzk88iNVy2P3UnXwmWzaD+vkAMXBJV+JOC -yinpXj9WV4s4NvdFGkwozZ5BuO1WTISkQMi4sKUraXAEasP41BIy+Q7DsdwyhEQsb8tGD+pmQQ9P -8Vilpg0ND2HepZ5dfWWhPBfnqFVO76DH7cZEf1T1o+CP8HxVIo8ptoGj4W1OLBuAZ+ytIJ8MYmHV -l/9D7S3B2l0pKoU/rGXuhg8FjZBf3+6f9L/uHfuY5H+QK4R4EA5sSVPvFVtlRkpdr7r7OnIdzfYl -iB6XzCGcKQENZetX2fNXlrtIzYE= ------END CERTIFICATE----- - Buypass Class 2 Root CA ======================= -----BEGIN CERTIFICATE----- @@ -3136,3 +3043,190 @@ gLWi5h+xEk8blTAKBggqhkjOPQQDAwNoADBlAjEA31SQ7Zvvi5QCkxeCmb6zniz2C5GMn0oUsfZk vLtoURMMA/cVi4RguYv/Uo7njLwcAjA8+RHUjE7AwWHCFUyqqx0LMV87HOIAl0Qx5v5zli/altP+ CAezNIm8BZ/3Hobui3A= -----END CERTIFICATE----- + +GLOBALTRUST 2020 +================ +-----BEGIN CERTIFICATE----- +MIIFgjCCA2qgAwIBAgILWku9WvtPilv6ZeUwDQYJKoZIhvcNAQELBQAwTTELMAkGA1UEBhMCQVQx +IzAhBgNVBAoTGmUtY29tbWVyY2UgbW9uaXRvcmluZyBHbWJIMRkwFwYDVQQDExBHTE9CQUxUUlVT +VCAyMDIwMB4XDTIwMDIxMDAwMDAwMFoXDTQwMDYxMDAwMDAwMFowTTELMAkGA1UEBhMCQVQxIzAh +BgNVBAoTGmUtY29tbWVyY2UgbW9uaXRvcmluZyBHbWJIMRkwFwYDVQQDExBHTE9CQUxUUlVTVCAy +MDIwMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAri5WrRsc7/aVj6B3GyvTY4+ETUWi +D59bRatZe1E0+eyLinjF3WuvvcTfk0Uev5E4C64OFudBc/jbu9G4UeDLgztzOG53ig9ZYybNpyrO +VPu44sB8R85gfD+yc/LAGbaKkoc1DZAoouQVBGM+uq/ufF7MpotQsjj3QWPKzv9pj2gOlTblzLmM +CcpL3TGQlsjMH/1WljTbjhzqLL6FLmPdqqmV0/0plRPwyJiT2S0WR5ARg6I6IqIoV6Lr/sCMKKCm +fecqQjuCgGOlYx8ZzHyyZqjC0203b+J+BlHZRYQfEs4kUmSFC0iAToexIiIwquuuvuAC4EDosEKA +A1GqtH6qRNdDYfOiaxaJSaSjpCuKAsR49GiKweR6NrFvG5Ybd0mN1MkGco/PU+PcF4UgStyYJ9OR +JitHHmkHr96i5OTUawuzXnzUJIBHKWk7buis/UDr2O1xcSvy6Fgd60GXIsUf1DnQJ4+H4xj04KlG +DfV0OoIu0G4skaMxXDtG6nsEEFZegB31pWXogvziB4xiRfUg3kZwhqG8k9MedKZssCz3AwyIDMvU +clOGvGBG85hqwvG/Q/lwIHfKN0F5VVJjjVsSn8VoxIidrPIwq7ejMZdnrY8XD2zHc+0klGvIg5rQ +mjdJBKuxFshsSUktq6HQjJLyQUp5ISXbY9e2nKd+Qmn7OmMCAwEAAaNjMGEwDwYDVR0TAQH/BAUw +AwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFNwuH9FhN3nkq9XVsxJxaD1qaJwiMB8GA1Ud +IwQYMBaAFNwuH9FhN3nkq9XVsxJxaD1qaJwiMA0GCSqGSIb3DQEBCwUAA4ICAQCR8EICaEDuw2jA +VC/f7GLDw56KoDEoqoOOpFaWEhCGVrqXctJUMHytGdUdaG/7FELYjQ7ztdGl4wJCXtzoRlgHNQIw +4Lx0SsFDKv/bGtCwr2zD/cuz9X9tAy5ZVp0tLTWMstZDFyySCstd6IwPS3BD0IL/qMy/pJTAvoe9 +iuOTe8aPmxadJ2W8esVCgmxcB9CpwYhgROmYhRZf+I/KARDOJcP5YBugxZfD0yyIMaK9MOzQ0MAS +8cE54+X1+NZK3TTN+2/BT+MAi1bikvcoskJ3ciNnxz8RFbLEAwW+uxF7Cr+obuf/WEPPm2eggAe2 +HcqtbepBEX4tdJP7wry+UUTF72glJ4DjyKDUEuzZpTcdN3y0kcra1LGWge9oXHYQSa9+pTeAsRxS +vTOBTI/53WXZFM2KJVj04sWDpQmQ1GwUY7VA3+vA/MRYfg0UFodUJ25W5HCEuGwyEn6CMUO+1918 +oa2u1qsgEu8KwxCMSZY13At1XrFP1U80DhEgB3VDRemjEdqso5nCtnkn4rnvyOL2NSl6dPrFf4IF +YqYK6miyeUcGbvJXqBUzxvd4Sj1Ce2t+/vdG6tHrju+IaFvowdlxfv1k7/9nR4hYJS8+hge9+6jl +gqispdNpQ80xiEmEU5LAsTkbOYMBMMTyqfrQA71yN2BWHzZ8vTmR9W0Nv3vXkg== +-----END CERTIFICATE----- + +ANF Secure Server Root CA +========================= +-----BEGIN CERTIFICATE----- +MIIF7zCCA9egAwIBAgIIDdPjvGz5a7EwDQYJKoZIhvcNAQELBQAwgYQxEjAQBgNVBAUTCUc2MzI4 +NzUxMDELMAkGA1UEBhMCRVMxJzAlBgNVBAoTHkFORiBBdXRvcmlkYWQgZGUgQ2VydGlmaWNhY2lv +bjEUMBIGA1UECxMLQU5GIENBIFJhaXoxIjAgBgNVBAMTGUFORiBTZWN1cmUgU2VydmVyIFJvb3Qg +Q0EwHhcNMTkwOTA0MTAwMDM4WhcNMzkwODMwMTAwMDM4WjCBhDESMBAGA1UEBRMJRzYzMjg3NTEw +MQswCQYDVQQGEwJFUzEnMCUGA1UEChMeQU5GIEF1dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uMRQw +EgYDVQQLEwtBTkYgQ0EgUmFpejEiMCAGA1UEAxMZQU5GIFNlY3VyZSBTZXJ2ZXIgUm9vdCBDQTCC +AiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANvrayvmZFSVgpCjcqQZAZ2cC4Ffc0m6p6zz +BE57lgvsEeBbphzOG9INgxwruJ4dfkUyYA8H6XdYfp9qyGFOtibBTI3/TO80sh9l2Ll49a2pcbnv +T1gdpd50IJeh7WhM3pIXS7yr/2WanvtH2Vdy8wmhrnZEE26cLUQ5vPnHO6RYPUG9tMJJo8gN0pcv +B2VSAKduyK9o7PQUlrZXH1bDOZ8rbeTzPvY1ZNoMHKGESy9LS+IsJJ1tk0DrtSOOMspvRdOoiXse +zx76W0OLzc2oD2rKDF65nkeP8Nm2CgtYZRczuSPkdxl9y0oukntPLxB3sY0vaJxizOBQ+OyRp1RM +VwnVdmPF6GUe7m1qzwmd+nxPrWAI/VaZDxUse6mAq4xhj0oHdkLePfTdsiQzW7i1o0TJrH93PB0j +7IKppuLIBkwC/qxcmZkLLxCKpvR/1Yd0DVlJRfbwcVw5Kda/SiOL9V8BY9KHcyi1Swr1+KuCLH5z +JTIdC2MKF4EA/7Z2Xue0sUDKIbvVgFHlSFJnLNJhiQcND85Cd8BEc5xEUKDbEAotlRyBr+Qc5RQe +8TZBAQIvfXOn3kLMTOmJDVb3n5HUA8ZsyY/b2BzgQJhdZpmYgG4t/wHFzstGH6wCxkPmrqKEPMVO +Hj1tyRRM4y5Bu8o5vzY8KhmqQYdOpc5LMnndkEl/AgMBAAGjYzBhMB8GA1UdIwQYMBaAFJxf0Gxj +o1+TypOYCK2Mh6UsXME3MB0GA1UdDgQWBBScX9BsY6Nfk8qTmAitjIelLFzBNzAOBgNVHQ8BAf8E +BAMCAYYwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEATh65isagmD9uw2nAalxJ +UqzLK114OMHVVISfk/CHGT0sZonrDUL8zPB1hT+L9IBdeeUXZ701guLyPI59WzbLWoAAKfLOKyzx +j6ptBZNscsdW699QIyjlRRA96Gejrw5VD5AJYu9LWaL2U/HANeQvwSS9eS9OICI7/RogsKQOLHDt +dD+4E5UGUcjohybKpFtqFiGS3XNgnhAY3jyB6ugYw3yJ8otQPr0R4hUDqDZ9MwFsSBXXiJCZBMXM +5gf0vPSQ7RPi6ovDj6MzD8EpTBNO2hVWcXNyglD2mjN8orGoGjR0ZVzO0eurU+AagNjqOknkJjCb +5RyKqKkVMoaZkgoQI1YS4PbOTOK7vtuNknMBZi9iPrJyJ0U27U1W45eZ/zo1PqVUSlJZS2Db7v54 +EX9K3BR5YLZrZAPbFYPhor72I5dQ8AkzNqdxliXzuUJ92zg/LFis6ELhDtjTO0wugumDLmsx2d1H +hk9tl5EuT+IocTUW0fJz/iUrB0ckYyfI+PbZa/wSMVYIwFNCr5zQM378BvAxRAMU8Vjq8moNqRGy +g77FGr8H6lnco4g175x2MjxNBiLOFeXdntiP2t7SxDnlF4HPOEfrf4htWRvfn0IUrn7PqLBmZdo3 +r5+qPeoott7VMVgWglvquxl1AnMaykgaIZOQCo6ThKd9OyMYkomgjaw= +-----END CERTIFICATE----- + +Certum EC-384 CA +================ +-----BEGIN CERTIFICATE----- +MIICZTCCAeugAwIBAgIQeI8nXIESUiClBNAt3bpz9DAKBggqhkjOPQQDAzB0MQswCQYDVQQGEwJQ +TDEhMB8GA1UEChMYQXNzZWNvIERhdGEgU3lzdGVtcyBTLkEuMScwJQYDVQQLEx5DZXJ0dW0gQ2Vy +dGlmaWNhdGlvbiBBdXRob3JpdHkxGTAXBgNVBAMTEENlcnR1bSBFQy0zODQgQ0EwHhcNMTgwMzI2 +MDcyNDU0WhcNNDMwMzI2MDcyNDU0WjB0MQswCQYDVQQGEwJQTDEhMB8GA1UEChMYQXNzZWNvIERh +dGEgU3lzdGVtcyBTLkEuMScwJQYDVQQLEx5DZXJ0dW0gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkx +GTAXBgNVBAMTEENlcnR1bSBFQy0zODQgQ0EwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAATEKI6rGFtq +vm5kN2PkzeyrOvfMobgOgknXhimfoZTy42B4mIF4Bk3y7JoOV2CDn7TmFy8as10CW4kjPMIRBSqn +iBMY81CE1700LCeJVf/OTOffph8oxPBUw7l8t1Ot68KjQjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYD +VR0OBBYEFI0GZnQkdjrzife81r1HfS+8EF9LMA4GA1UdDwEB/wQEAwIBBjAKBggqhkjOPQQDAwNo +ADBlAjADVS2m5hjEfO/JUG7BJw+ch69u1RsIGL2SKcHvlJF40jocVYli5RsJHrpka/F2tNQCMQC0 +QoSZ/6vnnvuRlydd3LBbMHHOXjgaatkl5+r3YZJW+OraNsKHZZYuciUvf9/DE8k= +-----END CERTIFICATE----- + +Certum Trusted Root CA +====================== +-----BEGIN CERTIFICATE----- +MIIFwDCCA6igAwIBAgIQHr9ZULjJgDdMBvfrVU+17TANBgkqhkiG9w0BAQ0FADB6MQswCQYDVQQG +EwJQTDEhMB8GA1UEChMYQXNzZWNvIERhdGEgU3lzdGVtcyBTLkEuMScwJQYDVQQLEx5DZXJ0dW0g +Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkxHzAdBgNVBAMTFkNlcnR1bSBUcnVzdGVkIFJvb3QgQ0Ew +HhcNMTgwMzE2MTIxMDEzWhcNNDMwMzE2MTIxMDEzWjB6MQswCQYDVQQGEwJQTDEhMB8GA1UEChMY +QXNzZWNvIERhdGEgU3lzdGVtcyBTLkEuMScwJQYDVQQLEx5DZXJ0dW0gQ2VydGlmaWNhdGlvbiBB +dXRob3JpdHkxHzAdBgNVBAMTFkNlcnR1bSBUcnVzdGVkIFJvb3QgQ0EwggIiMA0GCSqGSIb3DQEB +AQUAA4ICDwAwggIKAoICAQDRLY67tzbqbTeRn06TpwXkKQMlzhyC93yZn0EGze2jusDbCSzBfN8p +fktlL5On1AFrAygYo9idBcEq2EXxkd7fO9CAAozPOA/qp1x4EaTByIVcJdPTsuclzxFUl6s1wB52 +HO8AU5853BSlLCIls3Jy/I2z5T4IHhQqNwuIPMqw9MjCoa68wb4pZ1Xi/K1ZXP69VyywkI3C7Te2 +fJmItdUDmj0VDT06qKhF8JVOJVkdzZhpu9PMMsmN74H+rX2Ju7pgE8pllWeg8xn2A1bUatMn4qGt +g/BKEiJ3HAVz4hlxQsDsdUaakFjgao4rpUYwBI4Zshfjvqm6f1bxJAPXsiEodg42MEx51UGamqi4 +NboMOvJEGyCI98Ul1z3G4z5D3Yf+xOr1Uz5MZf87Sst4WmsXXw3Hw09Omiqi7VdNIuJGmj8PkTQk +fVXjjJU30xrwCSss0smNtA0Aq2cpKNgB9RkEth2+dv5yXMSFytKAQd8FqKPVhJBPC/PgP5sZ0jeJ +P/J7UhyM9uH3PAeXjA6iWYEMspA90+NZRu0PqafegGtaqge2Gcu8V/OXIXoMsSt0Puvap2ctTMSY +njYJdmZm/Bo/6khUHL4wvYBQv3y1zgD2DGHZ5yQD4OMBgQ692IU0iL2yNqh7XAjlRICMb/gv1SHK +HRzQ+8S1h9E6Tsd2tTVItQIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBSM+xx1 +vALTn04uSNn5YFSqxLNP+jAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQENBQADggIBAEii1QAL +LtA/vBzVtVRJHlpr9OTy4EA34MwUe7nJ+jW1dReTagVphZzNTxl4WxmB82M+w85bj/UvXgF2Ez8s +ALnNllI5SW0ETsXpD4YN4fqzX4IS8TrOZgYkNCvozMrnadyHncI013nR03e4qllY/p0m+jiGPp2K +h2RX5Rc64vmNueMzeMGQ2Ljdt4NR5MTMI9UGfOZR0800McD2RrsLrfw9EAUqO0qRJe6M1ISHgCq8 +CYyqOhNf6DR5UMEQGfnTKB7U0VEwKbOukGfWHwpjscWpxkIxYxeU72nLL/qMFH3EQxiJ2fAyQOaA +4kZf5ePBAFmo+eggvIksDkc0C+pXwlM2/KfUrzHN/gLldfq5Jwn58/U7yn2fqSLLiMmq0Uc9Nneo +WWRrJ8/vJ8HjJLWG965+Mk2weWjROeiQWMODvA8s1pfrzgzhIMfatz7DP78v3DSk+yshzWePS/Tj +6tQ/50+6uaWTRRxmHyH6ZF5v4HaUMst19W7l9o/HuKTMqJZ9ZPskWkoDbGs4xugDQ5r3V7mzKWmT +OPQD8rv7gmsHINFSH5pkAnuYZttcTVoP0ISVoDwUQwbKytu4QTbaakRnh6+v40URFWkIsr4WOZck +bxJF0WddCajJFdr60qZfE2Efv4WstK2tBZQIgx51F9NxO5NQI1mg7TyRVJ12AMXDuDjb +-----END CERTIFICATE----- + +TunTrust Root CA +================ +-----BEGIN CERTIFICATE----- +MIIFszCCA5ugAwIBAgIUEwLV4kBMkkaGFmddtLu7sms+/BMwDQYJKoZIhvcNAQELBQAwYTELMAkG +A1UEBhMCVE4xNzA1BgNVBAoMLkFnZW5jZSBOYXRpb25hbGUgZGUgQ2VydGlmaWNhdGlvbiBFbGVj +dHJvbmlxdWUxGTAXBgNVBAMMEFR1blRydXN0IFJvb3QgQ0EwHhcNMTkwNDI2MDg1NzU2WhcNNDQw +NDI2MDg1NzU2WjBhMQswCQYDVQQGEwJUTjE3MDUGA1UECgwuQWdlbmNlIE5hdGlvbmFsZSBkZSBD +ZXJ0aWZpY2F0aW9uIEVsZWN0cm9uaXF1ZTEZMBcGA1UEAwwQVHVuVHJ1c3QgUm9vdCBDQTCCAiIw +DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMPN0/y9BFPdDCA61YguBUtB9YOCfvdZn56eY+hz +2vYGqU8ftPkLHzmMmiDQfgbU7DTZhrx1W4eI8NLZ1KMKsmwb60ksPqxd2JQDoOw05TDENX37Jk0b +bjBU2PWARZw5rZzJJQRNmpA+TkBuimvNKWfGzC3gdOgFVwpIUPp6Q9p+7FuaDmJ2/uqdHYVy7BG7 +NegfJ7/Boce7SBbdVtfMTqDhuazb1YMZGoXRlJfXyqNlC/M4+QKu3fZnz8k/9YosRxqZbwUN/dAd +gjH8KcwAWJeRTIAAHDOFli/LQcKLEITDCSSJH7UP2dl3RxiSlGBcx5kDPP73lad9UKGAwqmDrViW +VSHbhlnUr8a83YFuB9tgYv7sEG7aaAH0gxupPqJbI9dkxt/con3YS7qC0lH4Zr8GRuR5KiY2eY8f +Tpkdso8MDhz/yV3A/ZAQprE38806JG60hZC/gLkMjNWb1sjxVj8agIl6qeIbMlEsPvLfe/ZdeikZ +juXIvTZxi11Mwh0/rViizz1wTaZQmCXcI/m4WEEIcb9PuISgjwBUFfyRbVinljvrS5YnzWuioYas +DXxU5mZMZl+QviGaAkYt5IPCgLnPSz7ofzwB7I9ezX/SKEIBlYrilz0QIX32nRzFNKHsLA4KUiwS +VXAkPcvCFDVDXSdOvsC9qnyW5/yeYa1E0wCXAgMBAAGjYzBhMB0GA1UdDgQWBBQGmpsfU33x9aTI +04Y+oXNZtPdEITAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFAaamx9TffH1pMjThj6hc1m0 +90QhMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAgEAqgVutt0Vyb+zxiD2BkewhpMl +0425yAA/l/VSJ4hxyXT968pk21vvHl26v9Hr7lxpuhbI87mP0zYuQEkHDVneixCwSQXi/5E/S7fd +Ao74gShczNxtr18UnH1YeA32gAm56Q6XKRm4t+v4FstVEuTGfbvE7Pi1HE4+Z7/FXxttbUcoqgRY +YdZ2vyJ/0Adqp2RT8JeNnYA/u8EH22Wv5psymsNUk8QcCMNE+3tjEUPRahphanltkE8pjkcFwRJp +adbGNjHh/PqAulxPxOu3Mqz4dWEX1xAZufHSCe96Qp1bWgvUxpVOKs7/B9dPfhgGiPEZtdmYu65x +xBzndFlY7wyJz4sfdZMaBBSSSFCp61cpABbjNhzI+L/wM9VBD8TMPN3pM0MBkRArHtG5Xc0yGYuP +jCB31yLEQtyEFpslbei0VXF/sHyz03FJuc9SpAQ/3D2gu68zngowYI7bnV2UqL1g52KAdoGDDIzM +MEZJ4gzSqK/rYXHv5yJiqfdcZGyfFoxnNidF9Ql7v/YQCvGwjVRDjAS6oz/v4jXH+XTgbzRB0L9z +ZVcg+ZtnemZoJE6AZb0QmQZZ8mWvuMZHu/2QeItBcy6vVR/cO5JyboTT0GFMDcx2V+IthSIVNg3r +AZ3r2OvEhJn7wAzMMujjd9qDRIueVSjAi1jTkD5OGwDxFa2DK5o= +-----END CERTIFICATE----- + +HARICA TLS RSA Root CA 2021 +=========================== +-----BEGIN CERTIFICATE----- +MIIFpDCCA4ygAwIBAgIQOcqTHO9D88aOk8f0ZIk4fjANBgkqhkiG9w0BAQsFADBsMQswCQYDVQQG +EwJHUjE3MDUGA1UECgwuSGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9u +cyBDQTEkMCIGA1UEAwwbSEFSSUNBIFRMUyBSU0EgUm9vdCBDQSAyMDIxMB4XDTIxMDIxOTEwNTUz +OFoXDTQ1MDIxMzEwNTUzN1owbDELMAkGA1UEBhMCR1IxNzA1BgNVBAoMLkhlbGxlbmljIEFjYWRl +bWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgQ0ExJDAiBgNVBAMMG0hBUklDQSBUTFMgUlNB +IFJvb3QgQ0EgMjAyMTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAIvC569lmwVnlskN +JLnQDmT8zuIkGCyEf3dRywQRNrhe7Wlxp57kJQmXZ8FHws+RFjZiPTgE4VGC/6zStGndLuwRo0Xu +a2s7TL+MjaQenRG56Tj5eg4MmOIjHdFOY9TnuEFE+2uva9of08WRiFukiZLRgeaMOVig1mlDqa2Y +Ulhu2wr7a89o+uOkXjpFc5gH6l8Cct4MpbOfrqkdtx2z/IpZ525yZa31MJQjB/OCFks1mJxTuy/K +5FrZx40d/JiZ+yykgmvwKh+OC19xXFyuQnspiYHLA6OZyoieC0AJQTPb5lh6/a6ZcMBaD9YThnEv +dmn8kN3bLW7R8pv1GmuebxWMevBLKKAiOIAkbDakO/IwkfN4E8/BPzWr8R0RI7VDIp4BkrcYAuUR +0YLbFQDMYTfBKnya4dC6s1BG7oKsnTH4+yPiAwBIcKMJJnkVU2DzOFytOOqBAGMUuTNe3QvboEUH +GjMJ+E20pwKmafTCWQWIZYVWrkvL4N48fS0ayOn7H6NhStYqE613TBoYm5EPWNgGVMWX+Ko/IIqm +haZ39qb8HOLubpQzKoNQhArlT4b4UEV4AIHrW2jjJo3Me1xR9BQsQL4aYB16cmEdH2MtiKrOokWQ +CPxrvrNQKlr9qEgYRtaQQJKQCoReaDH46+0N0x3GfZkYVVYnZS6NRcUk7M7jAgMBAAGjQjBAMA8G +A1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFApII6ZgpJIKM+qTW8VX6iVNvRLuMA4GA1UdDwEB/wQE +AwIBhjANBgkqhkiG9w0BAQsFAAOCAgEAPpBIqm5iFSVmewzVjIuJndftTgfvnNAUX15QvWiWkKQU +EapobQk1OUAJ2vQJLDSle1mESSmXdMgHHkdt8s4cUCbjnj1AUz/3f5Z2EMVGpdAgS1D0NTsY9FVq +QRtHBmg8uwkIYtlfVUKqrFOFrJVWNlar5AWMxajaH6NpvVMPxP/cyuN+8kyIhkdGGvMA9YCRotxD +QpSbIPDRzbLrLFPCU3hKTwSUQZqPJzLB5UkZv/HywouoCjkxKLR9YjYsTewfM7Z+d21+UPCfDtcR +j88YxeMn/ibvBZ3PzzfF0HvaO7AWhAw6k9a+F9sPPg4ZeAnHqQJyIkv3N3a6dcSFA1pj1bF1BcK5 +vZStjBWZp5N99sXzqnTPBIWUmAD04vnKJGW/4GKvyMX6ssmeVkjaef2WdhW+o45WxLM0/L5H9MG0 +qPzVMIho7suuyWPEdr6sOBjhXlzPrjoiUevRi7PzKzMHVIf6tLITe7pTBGIBnfHAT+7hOtSLIBD6 +Alfm78ELt5BGnBkpjNxvoEppaZS3JGWg/6w/zgH7IS79aPib8qXPMThcFarmlwDB31qlpzmq6YR/ +PFGoOtmUW4y/Twhx5duoXNTSpv4Ao8YWxw/ogM4cKGR0GQjTQuPOAF1/sdwTsOEFy9EgqoZ0njnn +kf3/W9b3raYvAwtt41dU63ZTGI0RmLo= +-----END CERTIFICATE----- + +HARICA TLS ECC Root CA 2021 +=========================== +-----BEGIN CERTIFICATE----- +MIICVDCCAdugAwIBAgIQZ3SdjXfYO2rbIvT/WeK/zjAKBggqhkjOPQQDAzBsMQswCQYDVQQGEwJH +UjE3MDUGA1UECgwuSGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBD +QTEkMCIGA1UEAwwbSEFSSUNBIFRMUyBFQ0MgUm9vdCBDQSAyMDIxMB4XDTIxMDIxOTExMDExMFoX +DTQ1MDIxMzExMDEwOVowbDELMAkGA1UEBhMCR1IxNzA1BgNVBAoMLkhlbGxlbmljIEFjYWRlbWlj +IGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgQ0ExJDAiBgNVBAMMG0hBUklDQSBUTFMgRUNDIFJv +b3QgQ0EgMjAyMTB2MBAGByqGSM49AgEGBSuBBAAiA2IABDgI/rGgltJ6rK9JOtDA4MM7KKrxcm1l +AEeIhPyaJmuqS7psBAqIXhfyVYf8MLA04jRYVxqEU+kw2anylnTDUR9YSTHMmE5gEYd103KUkE+b +ECUqqHgtvpBBWJAVcqeht6NCMEAwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUyRtTgRL+BNUW +0aq8mm+3oJUZbsowDgYDVR0PAQH/BAQDAgGGMAoGCCqGSM49BAMDA2cAMGQCMBHervjcToiwqfAi +rcJRQO9gcS3ujwLEXQNwSaSS6sUUiHCm0w2wqsosQJz76YJumgIwK0eaB8bRwoF8yguWGEEbo/Qw +CZ61IygNnxS2PFOiTAZpffpskcYqSUXm7LcT4Tps +-----END CERTIFICATE----- diff --git a/vendor/composer/ca-bundle/src/CaBundle.php b/vendor/composer/ca-bundle/src/CaBundle.php index 0109ba037..d99c00f69 100644 --- a/vendor/composer/ca-bundle/src/CaBundle.php +++ b/vendor/composer/ca-bundle/src/CaBundle.php @@ -108,7 +108,7 @@ class CaBundle return self::$caPath = $caBundle; } - if ($caBundle && self::caDirUsable($caBundle)) { + if ($caBundle && self::caDirUsable($caBundle, $logger)) { return self::$caPath = $caBundle; } } @@ -335,19 +335,97 @@ EOT; /** * @param string|false $certFile + * @param LoggerInterface|null $logger * @return bool */ private static function caFileUsable($certFile, LoggerInterface $logger = null) { - return $certFile && @is_file($certFile) && @is_readable($certFile) && static::validateCaFile($certFile, $logger); + return $certFile + && static::isFile($certFile, $logger) + && static::isReadable($certFile, $logger) + && static::validateCaFile($certFile, $logger); } /** * @param string|false $certDir + * @param LoggerInterface|null $logger * @return bool */ - private static function caDirUsable($certDir) + private static function caDirUsable($certDir, LoggerInterface $logger = null) { - return $certDir && @is_dir($certDir) && @is_readable($certDir) && glob($certDir . '/*'); + return $certDir + && static::isDir($certDir, $logger) + && static::isReadable($certDir, $logger) + && static::glob($certDir . '/*', $logger); + } + + /** + * @param string $certFile + * @param LoggerInterface|null $logger + * @return bool + */ + private static function isFile($certFile, LoggerInterface $logger = null) + { + $isFile = @is_file($certFile); + if (!$isFile && $logger) { + $logger->debug(sprintf('Checked CA file %s does not exist or it is not a file.', $certFile)); + } + + return $isFile; + } + + /** + * @param string $certDir + * @param LoggerInterface|null $logger + * @return bool + */ + private static function isDir($certDir, LoggerInterface $logger = null) + { + $isDir = @is_dir($certDir); + if (!$isDir && $logger) { + $logger->debug(sprintf('Checked directory %s does not exist or it is not a directory.', $certDir)); + } + + return $isDir; + } + + /** + * @param string $certFileOrDir + * @param LoggerInterface|null $logger + * @return bool + */ + private static function isReadable($certFileOrDir, LoggerInterface $logger = null) + { + $isReadable = @is_readable($certFileOrDir); + if (!$isReadable && $logger) { + $logger->debug(sprintf('Checked file or directory %s is not readable.', $certFileOrDir)); + } + + return $isReadable; + } + + /** + * @param string $pattern + * @param LoggerInterface|null $logger + * @return bool + */ + private static function glob($pattern, LoggerInterface $logger = null) + { + $certs = glob($pattern); + if ($certs === false) { + if ($logger) { + $logger->debug(sprintf("An error occurred while trying to find certificates for pattern: %s", $pattern)); + } + return false; + } + + if (count($certs) === 0) { + if ($logger) { + $logger->debug(sprintf("No CA files found for pattern: %s", $pattern)); + } + return false; + } + + return true; } } diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 581665a6e..942fdcf52 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -2,17 +2,17 @@ "packages": [ { "name": "composer/ca-bundle", - "version": "1.2.10", - "version_normalized": "1.2.10.0", + "version": "1.3.1", + "version_normalized": "1.3.1.0", "source": { "type": "git", "url": "https://github.com/composer/ca-bundle.git", - "reference": "9fdb22c2e97a614657716178093cd1da90a64aa8" + "reference": "4c679186f2aca4ab6a0f1b0b9cf9252decb44d0b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/ca-bundle/zipball/9fdb22c2e97a614657716178093cd1da90a64aa8", - "reference": "9fdb22c2e97a614657716178093cd1da90a64aa8", + "url": "https://api.github.com/repos/composer/ca-bundle/zipball/4c679186f2aca4ab6a0f1b0b9cf9252decb44d0b", + "reference": "4c679186f2aca4ab6a0f1b0b9cf9252decb44d0b", "shasum": "" }, "require": { @@ -24,9 +24,9 @@ "phpstan/phpstan": "^0.12.55", "psr/log": "^1.0", "symfony/phpunit-bridge": "^4.2 || ^5", - "symfony/process": "^2.5 || ^3.0 || ^4.0 || ^5.0" + "symfony/process": "^2.5 || ^3.0 || ^4.0 || ^5.0 || ^6.0" }, - "time": "2021-06-07T13:58:28+00:00", + "time": "2021-10-28T20:44:15+00:00", "type": "library", "extra": { "branch-alias": { @@ -61,7 +61,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/ca-bundle/issues", - "source": "https://github.com/composer/ca-bundle/tree/1.2.10" + "source": "https://github.com/composer/ca-bundle/tree/1.3.1" }, "funding": [ { @@ -155,17 +155,17 @@ }, { "name": "geoip2/geoip2", - "version": "v2.11.0", - "version_normalized": "2.11.0.0", + "version": "v2.12.2", + "version_normalized": "2.12.2.0", "source": { "type": "git", "url": "https://github.com/maxmind/GeoIP2-php.git", - "reference": "d01be5894a5c1a3381c58c9b1795cd07f96c30f7" + "reference": "83adb44ac4b9553d36b579a14673ed124583082f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/maxmind/GeoIP2-php/zipball/d01be5894a5c1a3381c58c9b1795cd07f96c30f7", - "reference": "d01be5894a5c1a3381c58c9b1795cd07f96c30f7", + "url": "https://api.github.com/repos/maxmind/GeoIP2-php/zipball/83adb44ac4b9553d36b579a14673ed124583082f", + "reference": "83adb44ac4b9553d36b579a14673ed124583082f", "shasum": "" }, "require": { @@ -175,11 +175,12 @@ "php": ">=7.2" }, "require-dev": { - "friendsofphp/php-cs-fixer": "2.*", + "friendsofphp/php-cs-fixer": "3.*", + "phpstan/phpstan": "*", "phpunit/phpunit": "^8.0 || ^9.0", "squizlabs/php_codesniffer": "3.*" }, - "time": "2020-10-01T18:48:34+00:00", + "time": "2021-11-30T18:15:25+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -207,6 +208,10 @@ "geolocation", "maxmind" ], + "support": { + "issues": "https://github.com/maxmind/GeoIP2-php/issues", + "source": "https://github.com/maxmind/GeoIP2-php/tree/v2.12.2" + }, "install-path": "../geoip2/geoip2" }, { @@ -281,17 +286,17 @@ }, { "name": "guzzlehttp/promises", - "version": "1.4.1", - "version_normalized": "1.4.1.0", + "version": "1.5.1", + "version_normalized": "1.5.1.0", "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "8e7d04f1f6450fef59366c399cfad4b9383aa30d" + "reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/8e7d04f1f6450fef59366c399cfad4b9383aa30d", - "reference": "8e7d04f1f6450fef59366c399cfad4b9383aa30d", + "url": "https://api.github.com/repos/guzzle/promises/zipball/fe752aedc9fd8fcca3fe7ad05d419d32998a06da", + "reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da", "shasum": "" }, "require": { @@ -300,11 +305,11 @@ "require-dev": { "symfony/phpunit-bridge": "^4.4 || ^5.1" }, - "time": "2021-03-07T09:25:29+00:00", + "time": "2021-10-22T20:56:57+00:00", "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4-dev" + "dev-master": "1.5-dev" } }, "installation-source": "dist", @@ -321,31 +326,64 @@ "MIT" ], "authors": [ + { + "name": "Graham Campbell", + "email": "hello@gjcampbell.co.uk", + "homepage": "https://github.com/GrahamCampbell" + }, { "name": "Michael Dowling", "email": "mtdowling@gmail.com", "homepage": "https://github.com/mtdowling" + }, + { + "name": "Tobias Nyholm", + "email": "tobias.nyholm@gmail.com", + "homepage": "https://github.com/Nyholm" + }, + { + "name": "Tobias Schultze", + "email": "webmaster@tubo-world.de", + "homepage": "https://github.com/Tobion" } ], "description": "Guzzle promises library", "keywords": [ "promise" ], + "support": { + "issues": "https://github.com/guzzle/promises/issues", + "source": "https://github.com/guzzle/promises/tree/1.5.1" + }, + "funding": [ + { + "url": "https://github.com/GrahamCampbell", + "type": "github" + }, + { + "url": "https://github.com/Nyholm", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/promises", + "type": "tidelift" + } + ], "install-path": "../guzzlehttp/promises" }, { "name": "guzzlehttp/psr7", - "version": "1.8.2", - "version_normalized": "1.8.2.0", + "version": "1.8.3", + "version_normalized": "1.8.3.0", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "dc960a912984efb74d0a90222870c72c87f10c91" + "reference": "1afdd860a2566ed3c2b0b4a3de6e23434a79ec85" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/dc960a912984efb74d0a90222870c72c87f10c91", - "reference": "dc960a912984efb74d0a90222870c72c87f10c91", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/1afdd860a2566ed3c2b0b4a3de6e23434a79ec85", + "reference": "1afdd860a2566ed3c2b0b4a3de6e23434a79ec85", "shasum": "" }, "require": { @@ -363,7 +401,7 @@ "suggest": { "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses" }, - "time": "2021-04-26T09:17:50+00:00", + "time": "2021-10-05T13:56:00+00:00", "type": "library", "extra": { "branch-alias": { @@ -384,13 +422,34 @@ "MIT" ], "authors": [ + { + "name": "Graham Campbell", + "email": "hello@gjcampbell.co.uk", + "homepage": "https://github.com/GrahamCampbell" + }, { "name": "Michael Dowling", "email": "mtdowling@gmail.com", "homepage": "https://github.com/mtdowling" }, + { + "name": "George Mponos", + "email": "gmponos@gmail.com", + "homepage": "https://github.com/gmponos" + }, + { + "name": "Tobias Nyholm", + "email": "tobias.nyholm@gmail.com", + "homepage": "https://github.com/Nyholm" + }, + { + "name": "Márk Sági-Kazár", + "email": "mark.sagikazar@gmail.com", + "homepage": "https://github.com/sagikazarmark" + }, { "name": "Tobias Schultze", + "email": "webmaster@tubo-world.de", "homepage": "https://github.com/Tobion" } ], @@ -405,21 +464,39 @@ "uri", "url" ], + "support": { + "issues": "https://github.com/guzzle/psr7/issues", + "source": "https://github.com/guzzle/psr7/tree/1.8.3" + }, + "funding": [ + { + "url": "https://github.com/GrahamCampbell", + "type": "github" + }, + { + "url": "https://github.com/Nyholm", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/psr7", + "type": "tidelift" + } + ], "install-path": "../guzzlehttp/psr7" }, { "name": "maxmind-db/reader", - "version": "v1.10.1", - "version_normalized": "1.10.1.0", + "version": "v1.11.0", + "version_normalized": "1.11.0.0", "source": { "type": "git", "url": "https://github.com/maxmind/MaxMind-DB-Reader-php.git", - "reference": "569bd44d97d30a4ec12c7793a33004a76d4caf18" + "reference": "b1f3c0699525336d09cc5161a2861268d9f2ae5b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/maxmind/MaxMind-DB-Reader-php/zipball/569bd44d97d30a4ec12c7793a33004a76d4caf18", - "reference": "569bd44d97d30a4ec12c7793a33004a76d4caf18", + "url": "https://api.github.com/repos/maxmind/MaxMind-DB-Reader-php/zipball/b1f3c0699525336d09cc5161a2861268d9f2ae5b", + "reference": "b1f3c0699525336d09cc5161a2861268d9f2ae5b", "shasum": "" }, "require": { @@ -429,7 +506,7 @@ "ext-maxminddb": "<1.10.1,>=2.0.0" }, "require-dev": { - "friendsofphp/php-cs-fixer": "*", + "friendsofphp/php-cs-fixer": "3.*", "php-coveralls/php-coveralls": "^2.1", "phpstan/phpstan": "*", "phpunit/phpcov": ">=6.0.0", @@ -441,7 +518,7 @@ "ext-gmp": "bcmath or gmp is required for decoding larger integers with the pure PHP decoder", "ext-maxminddb": "A C-based database decoder that provides significantly faster lookups" }, - "time": "2021-04-14T17:49:35+00:00", + "time": "2021-10-18T15:23:10+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -469,6 +546,10 @@ "geolocation", "maxmind" ], + "support": { + "issues": "https://github.com/maxmind/MaxMind-DB-Reader-php/issues", + "source": "https://github.com/maxmind/MaxMind-DB-Reader-php/tree/v1.11.0" + }, "install-path": "../maxmind-db/reader" }, { @@ -718,26 +799,26 @@ }, { "name": "paypal/paypal-checkout-sdk", - "version": "1.0.1", - "version_normalized": "1.0.1.0", + "version": "1.0.2", + "version_normalized": "1.0.2.0", "source": { "type": "git", "url": "https://github.com/paypal/Checkout-PHP-SDK.git", - "reference": "ed6a55075448308b87a8b59dcb7fedf04a048cb1" + "reference": "19992ce7051ff9e47e643f28abb8cc1b3e5f1812" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paypal/Checkout-PHP-SDK/zipball/ed6a55075448308b87a8b59dcb7fedf04a048cb1", - "reference": "ed6a55075448308b87a8b59dcb7fedf04a048cb1", + "url": "https://api.github.com/repos/paypal/Checkout-PHP-SDK/zipball/19992ce7051ff9e47e643f28abb8cc1b3e5f1812", + "reference": "19992ce7051ff9e47e643f28abb8cc1b3e5f1812", "shasum": "" }, "require": { - "paypal/paypalhttp": "1.0.0" + "paypal/paypalhttp": "1.0.1" }, "require-dev": { "phpunit/phpunit": "^5.7" }, - "time": "2019-11-07T23:16:44+00:00", + "time": "2021-09-21T20:57:38+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -766,21 +847,24 @@ "rest", "sdk" ], + "support": { + "source": "https://github.com/paypal/Checkout-PHP-SDK/tree/1.0.2" + }, "install-path": "../paypal/paypal-checkout-sdk" }, { "name": "paypal/paypalhttp", - "version": "1.0.0", - "version_normalized": "1.0.0.0", + "version": "1.0.1", + "version_normalized": "1.0.1.0", "source": { "type": "git", "url": "https://github.com/paypal/paypalhttp_php.git", - "reference": "1ad9b846a046f09d6135cbf2cbaa7701bbc630a3" + "reference": "7b09c89c80828e842c79230e7f156b61fbb68d25" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paypal/paypalhttp_php/zipball/1ad9b846a046f09d6135cbf2cbaa7701bbc630a3", - "reference": "1ad9b846a046f09d6135cbf2cbaa7701bbc630a3", + "url": "https://api.github.com/repos/paypal/paypalhttp_php/zipball/7b09c89c80828e842c79230e7f156b61fbb68d25", + "reference": "7b09c89c80828e842c79230e7f156b61fbb68d25", "shasum": "" }, "require": { @@ -790,7 +874,7 @@ "phpunit/phpunit": "^5.7", "wiremock-php/wiremock-php": "1.43.2" }, - "time": "2019-11-06T21:27:12+00:00", + "time": "2021-09-14T21:35:26+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -808,21 +892,25 @@ "homepage": "https://github.com/paypal/paypalhttp_php/contributors" } ], + "support": { + "issues": "https://github.com/paypal/paypalhttp_php/issues", + "source": "https://github.com/paypal/paypalhttp_php/tree/1.0.1" + }, "install-path": "../paypal/paypalhttp" }, { "name": "phpmailer/phpmailer", - "version": "v6.5.1", - "version_normalized": "6.5.1.0", + "version": "v6.5.3", + "version_normalized": "6.5.3.0", "source": { "type": "git", "url": "https://github.com/PHPMailer/PHPMailer.git", - "reference": "dd803df5ad7492e1b40637f7ebd258fee5ca7355" + "reference": "baeb7cde6b60b1286912690ab0693c7789a31e71" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/dd803df5ad7492e1b40637f7ebd258fee5ca7355", - "reference": "dd803df5ad7492e1b40637f7ebd258fee5ca7355", + "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/baeb7cde6b60b1286912690ab0693c7789a31e71", + "reference": "baeb7cde6b60b1286912690ab0693c7789a31e71", "shasum": "" }, "require": { @@ -849,7 +937,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-08-18T09:14:16+00:00", + "time": "2021-11-25T16:34:11+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -881,7 +969,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.1" + "source": "https://github.com/PHPMailer/PHPMailer/tree/v6.5.3" }, "funding": [ { @@ -1125,17 +1213,17 @@ }, { "name": "stripe/stripe-php", - "version": "v7.94.0", - "version_normalized": "7.94.0.0", + "version": "v7.105.0", + "version_normalized": "7.105.0.0", "source": { "type": "git", "url": "https://github.com/stripe/stripe-php.git", - "reference": "03cd6b5c1c4fc9087ddd1dd046457bff274294d6" + "reference": "3a926610ca772aa7519fb132c88a6e7472788d90" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/stripe/stripe-php/zipball/03cd6b5c1c4fc9087ddd1dd046457bff274294d6", - "reference": "03cd6b5c1c4fc9087ddd1dd046457bff274294d6", + "url": "https://api.github.com/repos/stripe/stripe-php/zipball/3a926610ca772aa7519fb132c88a6e7472788d90", + "reference": "3a926610ca772aa7519fb132c88a6e7472788d90", "shasum": "" }, "require": { @@ -1145,13 +1233,12 @@ "php": ">=5.6.0" }, "require-dev": { - "friendsofphp/php-cs-fixer": "2.17.1", - "php-coveralls/php-coveralls": "^2.1", - "phpunit/phpunit": "^5.7", - "squizlabs/php_codesniffer": "^3.3", - "symfony/process": "~3.4" + "friendsofphp/php-cs-fixer": "3.2.1", + "phpstan/phpstan": "^1.2", + "phpunit/phpunit": "^5.7 || ^9.0", + "squizlabs/php_codesniffer": "^3.3" }, - "time": "2021-08-19T14:15:27+00:00", + "time": "2021-12-06T22:51:55+00:00", "type": "library", "extra": { "branch-alias": { @@ -1183,7 +1270,7 @@ ], "support": { "issues": "https://github.com/stripe/stripe-php/issues", - "source": "https://github.com/stripe/stripe-php/tree/v7.94.0" + "source": "https://github.com/stripe/stripe-php/tree/v7.105.0" }, "install-path": "../stripe/stripe-php" }, diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php index c5bad2469..27e7fa36c 100644 --- a/vendor/composer/installed.php +++ b/vendor/composer/installed.php @@ -5,7 +5,7 @@ 'type' => 'project', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), - 'reference' => '7dadd6ede285708f874a020c0152511e73fbf4b2', + 'reference' => '01747093b15bd2fd1afc5757a1466d4c4bf1dd3d', 'name' => '1ka/1ka.si', 'dev' => false, ), @@ -16,16 +16,16 @@ 'type' => 'project', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), - 'reference' => '7dadd6ede285708f874a020c0152511e73fbf4b2', + 'reference' => '01747093b15bd2fd1afc5757a1466d4c4bf1dd3d', 'dev_requirement' => false, ), 'composer/ca-bundle' => array( - 'pretty_version' => '1.2.10', - 'version' => '1.2.10.0', + 'pretty_version' => '1.3.1', + 'version' => '1.3.1.0', 'type' => 'library', 'install_path' => __DIR__ . '/./ca-bundle', 'aliases' => array(), - 'reference' => '9fdb22c2e97a614657716178093cd1da90a64aa8', + 'reference' => '4c679186f2aca4ab6a0f1b0b9cf9252decb44d0b', 'dev_requirement' => false, ), 'fgrosse/phpasn1' => array( @@ -38,12 +38,12 @@ 'dev_requirement' => false, ), 'geoip2/geoip2' => array( - 'pretty_version' => 'v2.11.0', - 'version' => '2.11.0.0', + 'pretty_version' => 'v2.12.2', + 'version' => '2.12.2.0', 'type' => 'library', 'install_path' => __DIR__ . '/../geoip2/geoip2', 'aliases' => array(), - 'reference' => 'd01be5894a5c1a3381c58c9b1795cd07f96c30f7', + 'reference' => '83adb44ac4b9553d36b579a14673ed124583082f', 'dev_requirement' => false, ), 'guzzlehttp/guzzle' => array( @@ -56,30 +56,30 @@ 'dev_requirement' => false, ), 'guzzlehttp/promises' => array( - 'pretty_version' => '1.4.1', - 'version' => '1.4.1.0', + 'pretty_version' => '1.5.1', + 'version' => '1.5.1.0', 'type' => 'library', 'install_path' => __DIR__ . '/../guzzlehttp/promises', 'aliases' => array(), - 'reference' => '8e7d04f1f6450fef59366c399cfad4b9383aa30d', + 'reference' => 'fe752aedc9fd8fcca3fe7ad05d419d32998a06da', 'dev_requirement' => false, ), 'guzzlehttp/psr7' => array( - 'pretty_version' => '1.8.2', - 'version' => '1.8.2.0', + 'pretty_version' => '1.8.3', + 'version' => '1.8.3.0', 'type' => 'library', 'install_path' => __DIR__ . '/../guzzlehttp/psr7', 'aliases' => array(), - 'reference' => 'dc960a912984efb74d0a90222870c72c87f10c91', + 'reference' => '1afdd860a2566ed3c2b0b4a3de6e23434a79ec85', 'dev_requirement' => false, ), 'maxmind-db/reader' => array( - 'pretty_version' => 'v1.10.1', - 'version' => '1.10.1.0', + 'pretty_version' => 'v1.11.0', + 'version' => '1.11.0.0', 'type' => 'library', 'install_path' => __DIR__ . '/../maxmind-db/reader', 'aliases' => array(), - 'reference' => '569bd44d97d30a4ec12c7793a33004a76d4caf18', + 'reference' => 'b1f3c0699525336d09cc5161a2861268d9f2ae5b', 'dev_requirement' => false, ), 'maxmind/web-service-common' => array( @@ -119,30 +119,30 @@ 'dev_requirement' => false, ), 'paypal/paypal-checkout-sdk' => array( - 'pretty_version' => '1.0.1', - 'version' => '1.0.1.0', + 'pretty_version' => '1.0.2', + 'version' => '1.0.2.0', 'type' => 'library', 'install_path' => __DIR__ . '/../paypal/paypal-checkout-sdk', 'aliases' => array(), - 'reference' => 'ed6a55075448308b87a8b59dcb7fedf04a048cb1', + 'reference' => '19992ce7051ff9e47e643f28abb8cc1b3e5f1812', 'dev_requirement' => false, ), 'paypal/paypalhttp' => array( - 'pretty_version' => '1.0.0', - 'version' => '1.0.0.0', + 'pretty_version' => '1.0.1', + 'version' => '1.0.1.0', 'type' => 'library', 'install_path' => __DIR__ . '/../paypal/paypalhttp', 'aliases' => array(), - 'reference' => '1ad9b846a046f09d6135cbf2cbaa7701bbc630a3', + 'reference' => '7b09c89c80828e842c79230e7f156b61fbb68d25', 'dev_requirement' => false, ), 'phpmailer/phpmailer' => array( - 'pretty_version' => 'v6.5.1', - 'version' => '6.5.1.0', + 'pretty_version' => 'v6.5.3', + 'version' => '6.5.3.0', 'type' => 'library', 'install_path' => __DIR__ . '/../phpmailer/phpmailer', 'aliases' => array(), - 'reference' => 'dd803df5ad7492e1b40637f7ebd258fee5ca7355', + 'reference' => 'baeb7cde6b60b1286912690ab0693c7789a31e71', 'dev_requirement' => false, ), 'psr/http-message' => array( @@ -188,12 +188,12 @@ 'dev_requirement' => false, ), 'stripe/stripe-php' => array( - 'pretty_version' => 'v7.94.0', - 'version' => '7.94.0.0', + 'pretty_version' => 'v7.105.0', + 'version' => '7.105.0.0', 'type' => 'library', 'install_path' => __DIR__ . '/../stripe/stripe-php', 'aliases' => array(), - 'reference' => '03cd6b5c1c4fc9087ddd1dd046457bff274294d6', + 'reference' => '3a926610ca772aa7519fb132c88a6e7472788d90', 'dev_requirement' => false, ), 'symfony/polyfill-intl-idn' => array( diff --git a/vendor/geoip2/geoip2/.github/dependabot.yml b/vendor/geoip2/geoip2/.github/dependabot.yml new file mode 100644 index 000000000..c630ffa6b --- /dev/null +++ b/vendor/geoip2/geoip2/.github/dependabot.yml @@ -0,0 +1,7 @@ +version: 2 +updates: +- package-ecosystem: composer + directory: "/" + schedule: + interval: daily + open-pull-requests-limit: 10 diff --git a/vendor/geoip2/geoip2/.github/workflows/lint.yml b/vendor/geoip2/geoip2/.github/workflows/lint.yml new file mode 100644 index 000000000..61dcb5631 --- /dev/null +++ b/vendor/geoip2/geoip2/.github/workflows/lint.yml @@ -0,0 +1,32 @@ +name: PHP Lints + +on: + push: + pull_request: + schedule: + - cron: '55 3 * * SUN' + +jobs: + run: + runs-on: ubuntu-latest + name: "PHP Lints" + steps: + - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + php-version: 7.4 + + - name: Checkout + uses: actions/checkout@v2 + + - name: Install dependencies + run: composer install --no-progress --prefer-dist --optimize-autoloader + + - name: Lint with php-cs-fixer + run: vendor/bin/php-cs-fixer fix --verbose --diff --dry-run + + - name: Lint with phpcs + run: vendor/bin/phpcs --standard=PSR2 src/ + + - name: Lint with phpstan + run: vendor/bin/phpstan analyze diff --git a/vendor/geoip2/geoip2/.github/workflows/test.yml b/vendor/geoip2/geoip2/.github/workflows/test.yml new file mode 100644 index 000000000..eba727d02 --- /dev/null +++ b/vendor/geoip2/geoip2/.github/workflows/test.yml @@ -0,0 +1,36 @@ +name: PHPUnit + +on: + push: + pull_request: + schedule: + - cron: '55 3 * * SUN' + +jobs: + run: + runs-on: ${{ matrix.operating-system }} + strategy: + matrix: + operating-system: [ubuntu-latest, windows-latest, macos-latest] + php-versions: ['7.2', '7.3', '7.4', '8.0'] + name: "PHP ${{ matrix.php-versions }} test on ${{ matrix.operating-system }}" + steps: + - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + php-version: ${{ matrix.php-versions }} + tools: composer + + - name: Setup problem matchers for PHPUnit + run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json" + + - name: Checkout + uses: actions/checkout@v2 + with: + submodules: true + + - name: Install dependencies + run: composer install --no-progress --prefer-dist --optimize-autoloader + + - name: Test with phpunit + run: vendor/bin/phpunit --coverage-text diff --git a/vendor/geoip2/geoip2/.php-cs-fixer.php b/vendor/geoip2/geoip2/.php-cs-fixer.php new file mode 100644 index 000000000..b95081077 --- /dev/null +++ b/vendor/geoip2/geoip2/.php-cs-fixer.php @@ -0,0 +1,45 @@ +setRiskyAllowed(true) + ->setRules([ + '@Symfony' => true, + '@Symfony:risky' => true, + '@PhpCsFixer' => true, + '@PSR1' => true, + '@PSR2' => true, + '@PSR12' => true, + '@PSR12:risky' => true, + 'array_syntax' => ['syntax' => 'short'], + 'combine_consecutive_unsets' => true, + 'concat_space' => [ 'spacing' => 'one'], + 'explicit_string_variable' => false, + 'fopen_flags' => ['b_mode' => true], + 'heredoc_to_nowdoc' => true, + 'increment_style' => false, + 'list_syntax' => ['syntax' => 'short'], + 'multiline_whitespace_before_semicolons' => false, + 'no_unreachable_default_argument_value' => true, + 'no_useless_else' => true, + 'no_useless_return' => true, + 'ordered_imports' => true, + 'php_unit_strict' => true, + 'php_unit_test_class_requires_covers' => true, + 'phpdoc_add_missing_param_annotation' => true, + 'phpdoc_no_alias_tag' => false, + 'phpdoc_order' => true, + 'phpdoc_types_order' => ['sort_algorithm' => 'alpha', 'null_adjustment' => 'always_last'], + 'semicolon_after_instruction' => true, + 'single_line_throw' => false, + 'strict_comparison' => true, + 'strict_param' => true, + 'yoda_style' => false, + ]) + ->setFinder( + PhpCsFixer\Finder::create() + ->exclude('ext') + ->in(__DIR__) + ) +; diff --git a/vendor/geoip2/geoip2/CHANGELOG.md b/vendor/geoip2/geoip2/CHANGELOG.md index 5af399874..c88fa216f 100644 --- a/vendor/geoip2/geoip2/CHANGELOG.md +++ b/vendor/geoip2/geoip2/CHANGELOG.md @@ -1,6 +1,39 @@ CHANGELOG ========= +2.12.2 (2021-11-30) +------------------- + +* The `geoip2.phar` now works when included from another directory. + Reported by Eduardo Ruiz. GitHub #179. + +2.12.1 (2021-11-23) +------------------- + +* The `geoip2.phar` included in 2.12.0 would only work in CLI applications. + This was due to a change in Box 3.x. The Phar should now work in all + applications. This release only affects users of the Phar file. + +2.12.0 (2021-11-18) +------------------- + +* Support for mobile country code (MCC) and mobile network codes (MNC) was + added for the GeoIP2 ISP and Enterprise databases as well as the GeoIP2 + City and Insights web services. `$mobileCountryCode` and + `$mobileNetworkCode` properties were added to `GeoIp2\Model\Isp` + for the GeoIP2 ISP database and `GeoIp2\Record\Traits` for the Enterprise + database and the GeoIP2 City and Insights web services. We expect this data + to be available by late January, 2022. +* `geoip2.phar` is now generated with Box 3.x. + +2.11.0 (2020-10-01) +------------------- + +* IMPORTANT: PHP 7.2 or greater is now required. +* Added the `isResidentialProxy` property to `GeoIp2\Model\AnonymousIP` and + `GeoIp2\Record\Traits`. +* Additional type hints have been added. + 2.10.0 (2019-12-12) ------------------- diff --git a/vendor/geoip2/geoip2/README.md b/vendor/geoip2/geoip2/README.md index e4a74dc10..9d92e6f49 100644 --- a/vendor/geoip2/geoip2/README.md +++ b/vendor/geoip2/geoip2/README.md @@ -2,11 +2,9 @@ ## Description ## -This package provides an API for the GeoIP2 -[web services](https://dev.maxmind.com/geoip/geoip2/web-services) and -[databases](https://dev.maxmind.com/geoip/geoip2/downloadable). The API also -works with the free -[GeoLite2 databases](https://dev.maxmind.com/geoip/geoip2/geolite2/). +This package provides an API for the GeoIP2 and GeoLite2 +[web services](https://dev.maxmind.com/geoip/docs/web-services?lang=en) and +[databases](https://dev.maxmind.com/geoip/docs/databases?lang=en). ## Install via Composer ## @@ -26,7 +24,7 @@ You should now have the file `composer.phar` in your project directory. Run in your project root: -``` +```sh php composer.phar require geoip2/geoip2:~2.0 ``` @@ -265,13 +263,33 @@ print($record->network . "\n"); // '128.101.101.101/32' ### Usage ### To use this API, you must create a new `\GeoIp2\WebService\Client` -object with your `$accountId` and `$licenseKey`, then you call the method -corresponding to a specific end point, passing it the IP address you want to -look up. +object with your `$accountId` and `$licenseKey`: -If the request succeeds, the method call will return a model class for the end -point you called. This model in turn contains multiple record classes, each of -which represents part of the data returned by the web service. +```php +$client = new Client(42, 'abcdef123456'); +``` + +You may also call the constructor with additional arguments. The third argument +specifies the language preferences when using the `->name` method on the model +classes that this client creates. The fourth argument is additional options +such as `host` and `timeout`. + +For instance, to call the GeoLite2 web service instead of GeoIP2 Precision: + +```php +$client = new Client(42, 'abcdef123456', ['en'], ['host' => 'geolite.info']); +``` + +After creating the client, you may now call the method corresponding to a +specific endpoint with the IP address to look up, e.g.: + +```php +$record = $client->city('128.101.101.101'); +``` + +If the request succeeds, the method call will return a model class for the +endpoint you called. This model in turn contains multiple record classes, each +of which represents part of the data returned by the web service. If there is an error, a structured exception is thrown. @@ -286,7 +304,8 @@ use GeoIp2\WebService\Client; // This creates a Client object that can be reused across requests. // Replace "42" with your account ID and "license_key" with your license -// key. +// key. Set the "host" to "geolite.info" in the fourth argument options +// array to use the GeoLite2 web service instead of GeoIP2 Precision. $client = new Client(42, 'abcdef123456'); // Replace "city" with the method corresponding to the web service that @@ -336,7 +355,7 @@ Because of these factors, it is possible for any end point to return a record where some or all of the attributes are unpopulated. See the -[GeoIP2 Precision web service docs](https://dev.maxmind.com/geoip/geoip2/web-services) +[GeoIP2 Precision web service docs](https://dev.maxmind.com/geoip/docs/web-services?lang=en) for details on what data each end point may return. The only piece of data which is always returned is the `ipAddress` @@ -386,7 +405,7 @@ to the client API, please see ## Requirements ## -This library requires PHP 5.6 or greater. +This library requires PHP 7.2 or greater. This library also relies on the [MaxMind DB Reader](https://github.com/maxmind/MaxMind-DB-Reader-php). @@ -404,6 +423,6 @@ The GeoIP2 PHP API uses [Semantic Versioning](https://semver.org/). ## Copyright and License ## -This software is Copyright (c) 2013-2019 by MaxMind, Inc. +This software is Copyright (c) 2013-2020 by MaxMind, Inc. This is free software, licensed under the Apache License, Version 2.0. diff --git a/vendor/geoip2/geoip2/composer.json b/vendor/geoip2/geoip2/composer.json index a945d1ab8..e29513b69 100644 --- a/vendor/geoip2/geoip2/composer.json +++ b/vendor/geoip2/geoip2/composer.json @@ -13,15 +13,16 @@ } ], "require": { - "maxmind-db/reader": "~1.5", - "maxmind/web-service-common": "~0.6", - "php": ">=5.6", + "maxmind-db/reader": "~1.8", + "maxmind/web-service-common": "~0.8", + "php": ">=7.2", "ext-json": "*" }, "require-dev": { - "friendsofphp/php-cs-fixer": "2.*", - "phpunit/phpunit": "5.*", - "squizlabs/php_codesniffer": "3.*" + "friendsofphp/php-cs-fixer": "3.*", + "phpunit/phpunit": "^8.0 || ^9.0", + "squizlabs/php_codesniffer": "3.*", + "phpstan/phpstan": "*" }, "autoload": { "psr-4": { diff --git a/vendor/geoip2/geoip2/examples/benchmark.php b/vendor/geoip2/geoip2/examples/benchmark.php index 7af2a5db1..a735a78ba 100644 --- a/vendor/geoip2/geoip2/examples/benchmark.php +++ b/vendor/geoip2/geoip2/examples/benchmark.php @@ -10,7 +10,8 @@ $reader = new Reader('GeoIP2-City.mmdb'); $count = 500000; $startTime = microtime(true); for ($i = 0; $i < $count; ++$i) { - $ip = long2ip(rand(0, pow(2, 32) - 1)); + $ip = long2ip(rand(0, 2 ** 32 - 1)); + try { $t = $reader->city($ip); } catch (\GeoIp2\Exception\AddressNotFoundException $e) { diff --git a/vendor/geoip2/geoip2/phpstan.neon b/vendor/geoip2/geoip2/phpstan.neon new file mode 100644 index 000000000..ee1616dbe --- /dev/null +++ b/vendor/geoip2/geoip2/phpstan.neon @@ -0,0 +1,7 @@ +parameters: + level: 6 + paths: + - src + - tests + checkMissingIterableValueType: false + diff --git a/vendor/geoip2/geoip2/src/Database/Reader.php b/vendor/geoip2/geoip2/src/Database/Reader.php index 813654753..266f7ed50 100644 --- a/vendor/geoip2/geoip2/src/Database/Reader.php +++ b/vendor/geoip2/geoip2/src/Database/Reader.php @@ -1,8 +1,11 @@ + */ private $locales; /** @@ -48,8 +60,8 @@ class Reader implements ProviderInterface * is corrupt or invalid */ public function __construct( - $filename, - $locales = ['en'] + string $filename, + array $locales = ['en'] ) { $this->dbReader = new DbReader($filename); $this->dbType = $this->dbReader->metadata()->databaseType; @@ -65,11 +77,10 @@ class Reader implements ProviderInterface * not in the database * @throws \MaxMind\Db\Reader\InvalidDatabaseException if the database * is corrupt or invalid - * - * @return \GeoIp2\Model\City */ - public function city($ipAddress) + public function city(string $ipAddress): \GeoIp2\Model\City { + // @phpstan-ignore-next-line return $this->modelFor('City', 'City', $ipAddress); } @@ -82,11 +93,10 @@ class Reader implements ProviderInterface * not in the database * @throws \MaxMind\Db\Reader\InvalidDatabaseException if the database * is corrupt or invalid - * - * @return \GeoIp2\Model\Country */ - public function country($ipAddress) + public function country(string $ipAddress): \GeoIp2\Model\Country { + // @phpstan-ignore-next-line return $this->modelFor('Country', 'Country', $ipAddress); } @@ -99,11 +109,10 @@ class Reader implements ProviderInterface * not in the database * @throws \MaxMind\Db\Reader\InvalidDatabaseException if the database * is corrupt or invalid - * - * @return \GeoIp2\Model\AnonymousIp */ - public function anonymousIp($ipAddress) + public function anonymousIp(string $ipAddress): \GeoIp2\Model\AnonymousIp { + // @phpstan-ignore-next-line return $this->flatModelFor( 'AnonymousIp', 'GeoIP2-Anonymous-IP', @@ -120,11 +129,10 @@ class Reader implements ProviderInterface * not in the database * @throws \MaxMind\Db\Reader\InvalidDatabaseException if the database * is corrupt or invalid - * - * @return \GeoIp2\Model\Asn */ - public function asn($ipAddress) + public function asn(string $ipAddress): \GeoIp2\Model\Asn { + // @phpstan-ignore-next-line return $this->flatModelFor( 'Asn', 'GeoLite2-ASN', @@ -141,11 +149,10 @@ class Reader implements ProviderInterface * not in the database * @throws \MaxMind\Db\Reader\InvalidDatabaseException if the database * is corrupt or invalid - * - * @return \GeoIp2\Model\ConnectionType */ - public function connectionType($ipAddress) + public function connectionType(string $ipAddress): \GeoIp2\Model\ConnectionType { + // @phpstan-ignore-next-line return $this->flatModelFor( 'ConnectionType', 'GeoIP2-Connection-Type', @@ -162,11 +169,10 @@ class Reader implements ProviderInterface * not in the database * @throws \MaxMind\Db\Reader\InvalidDatabaseException if the database * is corrupt or invalid - * - * @return \GeoIp2\Model\Domain */ - public function domain($ipAddress) + public function domain(string $ipAddress): \GeoIp2\Model\Domain { + // @phpstan-ignore-next-line return $this->flatModelFor( 'Domain', 'GeoIP2-Domain', @@ -183,11 +189,10 @@ class Reader implements ProviderInterface * not in the database * @throws \MaxMind\Db\Reader\InvalidDatabaseException if the database * is corrupt or invalid - * - * @return \GeoIp2\Model\Enterprise */ - public function enterprise($ipAddress) + public function enterprise(string $ipAddress): \GeoIp2\Model\Enterprise { + // @phpstan-ignore-next-line return $this->modelFor('Enterprise', 'Enterprise', $ipAddress); } @@ -200,11 +205,10 @@ class Reader implements ProviderInterface * not in the database * @throws \MaxMind\Db\Reader\InvalidDatabaseException if the database * is corrupt or invalid - * - * @return \GeoIp2\Model\Isp */ - public function isp($ipAddress) + public function isp(string $ipAddress): \GeoIp2\Model\Isp { + // @phpstan-ignore-next-line return $this->flatModelFor( 'Isp', 'GeoIP2-ISP', @@ -212,9 +216,9 @@ class Reader implements ProviderInterface ); } - private function modelFor($class, $type, $ipAddress) + private function modelFor(string $class, string $type, string $ipAddress): AbstractModel { - list($record, $prefixLen) = $this->getRecord($class, $type, $ipAddress); + [$record, $prefixLen] = $this->getRecord($class, $type, $ipAddress); $record['traits']['ip_address'] = $ipAddress; $record['traits']['prefix_len'] = $prefixLen; @@ -224,9 +228,9 @@ class Reader implements ProviderInterface return new $class($record, $this->locales); } - private function flatModelFor($class, $type, $ipAddress) + private function flatModelFor(string $class, string $type, string $ipAddress): AbstractModel { - list($record, $prefixLen) = $this->getRecord($class, $type, $ipAddress); + [$record, $prefixLen] = $this->getRecord($class, $type, $ipAddress); $record['ip_address'] = $ipAddress; $record['prefix_len'] = $prefixLen; @@ -235,15 +239,16 @@ class Reader implements ProviderInterface return new $class($record); } - private function getRecord($class, $type, $ipAddress) + private function getRecord(string $class, string $type, string $ipAddress): array { if (strpos($this->dbType, $type) === false) { $method = lcfirst($class); + throw new \BadMethodCallException( "The $method method cannot be used to open a {$this->dbType} database" ); } - list($record, $prefixLen) = $this->dbReader->getWithPrefixLen($ipAddress); + [$record, $prefixLen] = $this->dbReader->getWithPrefixLen($ipAddress); if ($record === null) { throw new AddressNotFoundException( "The address $ipAddress is not in the database." @@ -272,7 +277,7 @@ class Reader implements ProviderInterface * * @return \MaxMind\Db\Reader\Metadata object for the database */ - public function metadata() + public function metadata(): DbReader\Metadata { return $this->dbReader->metadata(); } @@ -280,7 +285,7 @@ class Reader implements ProviderInterface /** * Closes the GeoIP2 database and returns the resources to the system. */ - public function close() + public function close(): void { $this->dbReader->close(); } diff --git a/vendor/geoip2/geoip2/src/Exception/AddressNotFoundException.php b/vendor/geoip2/geoip2/src/Exception/AddressNotFoundException.php index d5483388b..628fb0672 100644 --- a/vendor/geoip2/geoip2/src/Exception/AddressNotFoundException.php +++ b/vendor/geoip2/geoip2/src/Exception/AddressNotFoundException.php @@ -1,5 +1,7 @@ uri = $uri; diff --git a/vendor/geoip2/geoip2/src/Exception/InvalidRequestException.php b/vendor/geoip2/geoip2/src/Exception/InvalidRequestException.php index 6464bcbb1..925b68df0 100644 --- a/vendor/geoip2/geoip2/src/Exception/InvalidRequestException.php +++ b/vendor/geoip2/geoip2/src/Exception/InvalidRequestException.php @@ -1,5 +1,7 @@ error = $error; diff --git a/vendor/geoip2/geoip2/src/Exception/OutOfQueriesException.php b/vendor/geoip2/geoip2/src/Exception/OutOfQueriesException.php index 87a6ade41..9734c8ce4 100644 --- a/vendor/geoip2/geoip2/src/Exception/OutOfQueriesException.php +++ b/vendor/geoip2/geoip2/src/Exception/OutOfQueriesException.php @@ -1,5 +1,7 @@ + */ protected $raw; /** * @ignore - * - * @param mixed $raw */ - public function __construct($raw) + public function __construct(array $raw) { $this->raw = $raw; } @@ -22,9 +25,9 @@ abstract class AbstractModel implements \JsonSerializable /** * @ignore * - * @param mixed $field + * @return mixed */ - protected function get($field) + protected function get(string $field) { if (isset($this->raw[$field])) { return $this->raw[$field]; @@ -39,12 +42,12 @@ abstract class AbstractModel implements \JsonSerializable /** * @ignore * - * @param mixed $attr + * @return mixed */ - public function __get($attr) + public function __get(string $attr) { if ($attr !== 'instance' && property_exists($this, $attr)) { - return $this->$attr; + return $this->{$attr}; } throw new \RuntimeException("Unknown attribute: $attr"); @@ -52,15 +55,13 @@ abstract class AbstractModel implements \JsonSerializable /** * @ignore - * - * @param mixed $attr */ - public function __isset($attr) + public function __isset(string $attr): bool { - return $attr !== 'instance' && isset($this->$attr); + return $attr !== 'instance' && isset($this->{$attr}); } - public function jsonSerialize() + public function jsonSerialize(): array { return $this->raw; } diff --git a/vendor/geoip2/geoip2/src/Model/AnonymousIp.php b/vendor/geoip2/geoip2/src/Model/AnonymousIp.php index a8f946ee8..9cb616b05 100644 --- a/vendor/geoip2/geoip2/src/Model/AnonymousIp.php +++ b/vendor/geoip2/geoip2/src/Model/AnonymousIp.php @@ -1,5 +1,7 @@ isAnonymousVpn = $this->get('is_anonymous_vpn'); $this->isHostingProvider = $this->get('is_hosting_provider'); $this->isPublicProxy = $this->get('is_public_proxy'); + $this->isResidentialProxy = $this->get('is_residential_proxy'); $this->isTorExitNode = $this->get('is_tor_exit_node'); $ipAddress = $this->get('ip_address'); $this->ipAddress = $ipAddress; diff --git a/vendor/geoip2/geoip2/src/Model/Asn.php b/vendor/geoip2/geoip2/src/Model/Asn.php index 8e7c802ee..8b75830f5 100644 --- a/vendor/geoip2/geoip2/src/Model/Asn.php +++ b/vendor/geoip2/geoip2/src/Model/Asn.php @@ -1,5 +1,7 @@ autonomousSystemNumber = $this->get('autonomous_system_number'); diff --git a/vendor/geoip2/geoip2/src/Model/City.php b/vendor/geoip2/geoip2/src/Model/City.php index 3e78c4f14..016c1959f 100644 --- a/vendor/geoip2/geoip2/src/Model/City.php +++ b/vendor/geoip2/geoip2/src/Model/City.php @@ -1,5 +1,7 @@ */ protected $subdivisions = []; /** * @ignore - * - * @param mixed $raw - * @param mixed $locales */ - public function __construct($raw, $locales = ['en']) + public function __construct(array $raw, array $locales = ['en']) { parent::__construct($raw, $locales); @@ -63,29 +70,28 @@ class City extends Country $this->createSubdivisions($raw, $locales); } - private function createSubdivisions($raw, $locales) + private function createSubdivisions(array $raw, array $locales): void { if (!isset($raw['subdivisions'])) { return; } foreach ($raw['subdivisions'] as $sub) { - array_push( - $this->subdivisions, + $this->subdivisions[] = new \GeoIp2\Record\Subdivision($sub, $locales) - ); + ; } } /** * @ignore * - * @param mixed $attr + * @return mixed */ - public function __get($attr) + public function __get(string $attr) { if ($attr === 'mostSpecificSubdivision') { - return $this->$attr(); + return $this->{$attr}(); } return parent::__get($attr); @@ -93,10 +99,8 @@ class City extends Country /** * @ignore - * - * @param mixed $attr */ - public function __isset($attr) + public function __isset(string $attr): bool { if ($attr === 'mostSpecificSubdivision') { // We always return a mostSpecificSubdivision, even if it is the @@ -107,7 +111,7 @@ class City extends Country return parent::__isset($attr); } - private function mostSpecificSubdivision() + private function mostSpecificSubdivision(): \GeoIp2\Record\Subdivision { return empty($this->subdivisions) ? new \GeoIp2\Record\Subdivision([], $this->locales) : diff --git a/vendor/geoip2/geoip2/src/Model/ConnectionType.php b/vendor/geoip2/geoip2/src/Model/ConnectionType.php index 8091e26ce..4f948d847 100644 --- a/vendor/geoip2/geoip2/src/Model/ConnectionType.php +++ b/vendor/geoip2/geoip2/src/Model/ConnectionType.php @@ -1,5 +1,7 @@ + */ protected $locales; + /** + * @var \GeoIp2\Record\MaxMind + */ protected $maxmind; + /** + * @var \GeoIp2\Record\Country + */ protected $registeredCountry; + /** + * @var \GeoIp2\Record\RepresentedCountry + */ protected $representedCountry; + /** + * @var \GeoIp2\Record\Traits + */ protected $traits; /** * @ignore - * - * @param mixed $raw - * @param mixed $locales */ - public function __construct($raw, $locales = ['en']) + public function __construct(array $raw, array $locales = ['en']) { parent::__construct($raw); diff --git a/vendor/geoip2/geoip2/src/Model/Domain.php b/vendor/geoip2/geoip2/src/Model/Domain.php index 5e2cf346d..dad71ff0a 100644 --- a/vendor/geoip2/geoip2/src/Model/Domain.php +++ b/vendor/geoip2/geoip2/src/Model/Domain.php @@ -1,5 +1,7 @@ autonomousSystemNumber = $this->get('autonomous_system_number'); $this->autonomousSystemOrganization = $this->get('autonomous_system_organization'); $this->isp = $this->get('isp'); + $this->mobileCountryCode = $this->get('mobile_country_code'); + $this->mobileNetworkCode = $this->get('mobile_network_code'); $this->organization = $this->get('organization'); $ipAddress = $this->get('ip_address'); diff --git a/vendor/geoip2/geoip2/src/ProviderInterface.php b/vendor/geoip2/geoip2/src/ProviderInterface.php index 44851b07e..7d1489126 100644 --- a/vendor/geoip2/geoip2/src/ProviderInterface.php +++ b/vendor/geoip2/geoip2/src/ProviderInterface.php @@ -1,5 +1,7 @@ + */ private $locales; /** * @ignore - * - * @param mixed $record - * @param mixed $locales */ - public function __construct($record, $locales = ['en']) + public function __construct(?array $record, array $locales = ['en']) { $this->locales = $locales; parent::__construct($record); @@ -21,9 +23,9 @@ abstract class AbstractPlaceRecord extends AbstractRecord /** * @ignore * - * @param mixed $attr + * @return mixed */ - public function __get($attr) + public function __get(string $attr) { if ($attr === 'name') { return $this->name(); @@ -34,28 +36,28 @@ abstract class AbstractPlaceRecord extends AbstractRecord /** * @ignore - * - * @param mixed $attr */ - public function __isset($attr) + public function __isset(string $attr): bool { if ($attr === 'name') { - return $this->firstSetNameLocale() === null ? false : true; + return $this->firstSetNameLocale() !== null; } return parent::__isset($attr); } - private function name() + private function name(): ?string { $locale = $this->firstSetNameLocale(); + // @phpstan-ignore-next-line return $locale === null ? null : $this->names[$locale]; } - private function firstSetNameLocale() + private function firstSetNameLocale(): ?string { foreach ($this->locales as $locale) { + // @phpstan-ignore-next-line if (isset($this->names[$locale])) { return $locale; } diff --git a/vendor/geoip2/geoip2/src/Record/AbstractRecord.php b/vendor/geoip2/geoip2/src/Record/AbstractRecord.php index dad2fd3f3..5ddb3c679 100644 --- a/vendor/geoip2/geoip2/src/Record/AbstractRecord.php +++ b/vendor/geoip2/geoip2/src/Record/AbstractRecord.php @@ -1,17 +1,20 @@ + */ private $record; /** * @ignore - * - * @param mixed $record */ - public function __construct($record) + public function __construct(?array $record) { $this->record = isset($record) ? $record : []; } @@ -19,42 +22,45 @@ abstract class AbstractRecord implements \JsonSerializable /** * @ignore * - * @param mixed $attr + * @return mixed */ - public function __get($attr) + public function __get(string $attr) { // XXX - kind of ugly but greatly reduces boilerplate code $key = $this->attributeToKey($attr); if ($this->__isset($attr)) { return $this->record[$key]; - } elseif ($this->validAttribute($attr)) { + } + if ($this->validAttribute($attr)) { if (preg_match('/^is_/', $key)) { return false; } return null; } + throw new \RuntimeException("Unknown attribute: $attr"); } - public function __isset($attr) + public function __isset(string $attr): bool { - return $this->validAttribute($attr) && - isset($this->record[$this->attributeToKey($attr)]); + return $this->validAttribute($attr) + && isset($this->record[$this->attributeToKey($attr)]); } - private function attributeToKey($attr) + private function attributeToKey(string $attr): string { return strtolower(preg_replace('/([A-Z])/', '_\1', $attr)); } - private function validAttribute($attr) + private function validAttribute(string $attr): bool { + // @phpstan-ignore-next-line return \in_array($attr, $this->validAttributes, true); } - public function jsonSerialize() + public function jsonSerialize(): ?array { return $this->record; } diff --git a/vendor/geoip2/geoip2/src/Record/City.php b/vendor/geoip2/geoip2/src/Record/City.php index 7f495ad7c..68b3166c0 100644 --- a/vendor/geoip2/geoip2/src/Record/City.php +++ b/vendor/geoip2/geoip2/src/Record/City.php @@ -1,5 +1,7 @@ */ protected $validAttributes = ['confidence', 'geonameId', 'names']; } diff --git a/vendor/geoip2/geoip2/src/Record/Continent.php b/vendor/geoip2/geoip2/src/Record/Continent.php index c6b17056e..103e2e3d8 100644 --- a/vendor/geoip2/geoip2/src/Record/Continent.php +++ b/vendor/geoip2/geoip2/src/Record/Continent.php @@ -1,5 +1,7 @@ */ protected $validAttributes = [ 'code', diff --git a/vendor/geoip2/geoip2/src/Record/Country.php b/vendor/geoip2/geoip2/src/Record/Country.php index ff9ecc7cd..3009ebc62 100644 --- a/vendor/geoip2/geoip2/src/Record/Country.php +++ b/vendor/geoip2/geoip2/src/Record/Country.php @@ -1,5 +1,7 @@ */ protected $validAttributes = [ 'confidence', diff --git a/vendor/geoip2/geoip2/src/Record/Location.php b/vendor/geoip2/geoip2/src/Record/Location.php index b59b3ee70..cb6111c2c 100644 --- a/vendor/geoip2/geoip2/src/Record/Location.php +++ b/vendor/geoip2/geoip2/src/Record/Location.php @@ -1,5 +1,7 @@ */ protected $validAttributes = [ 'averageIncome', diff --git a/vendor/geoip2/geoip2/src/Record/MaxMind.php b/vendor/geoip2/geoip2/src/Record/MaxMind.php index 2e2cc0024..e972506e5 100644 --- a/vendor/geoip2/geoip2/src/Record/MaxMind.php +++ b/vendor/geoip2/geoip2/src/Record/MaxMind.php @@ -1,5 +1,7 @@ */ protected $validAttributes = ['queriesRemaining']; } diff --git a/vendor/geoip2/geoip2/src/Record/Postal.php b/vendor/geoip2/geoip2/src/Record/Postal.php index 69508c782..3e9c2377b 100644 --- a/vendor/geoip2/geoip2/src/Record/Postal.php +++ b/vendor/geoip2/geoip2/src/Record/Postal.php @@ -1,5 +1,7 @@ */ protected $validAttributes = ['code', 'confidence']; } diff --git a/vendor/geoip2/geoip2/src/Record/RepresentedCountry.php b/vendor/geoip2/geoip2/src/Record/RepresentedCountry.php index bc79ee157..727c034af 100644 --- a/vendor/geoip2/geoip2/src/Record/RepresentedCountry.php +++ b/vendor/geoip2/geoip2/src/Record/RepresentedCountry.php @@ -1,5 +1,7 @@ + */ protected $validAttributes = [ 'confidence', 'geonameId', diff --git a/vendor/geoip2/geoip2/src/Record/Subdivision.php b/vendor/geoip2/geoip2/src/Record/Subdivision.php index 74ae3e2ca..0e8354938 100644 --- a/vendor/geoip2/geoip2/src/Record/Subdivision.php +++ b/vendor/geoip2/geoip2/src/Record/Subdivision.php @@ -1,5 +1,7 @@ */ protected $validAttributes = [ 'confidence', diff --git a/vendor/geoip2/geoip2/src/Record/Traits.php b/vendor/geoip2/geoip2/src/Record/Traits.php index e6b798f41..cbe6b597e 100644 --- a/vendor/geoip2/geoip2/src/Record/Traits.php +++ b/vendor/geoip2/geoip2/src/Record/Traits.php @@ -1,5 +1,7 @@ */ protected $validAttributes = [ 'autonomousSystemNumber', @@ -120,8 +135,11 @@ class Traits extends AbstractRecord 'isLegitimateProxy', 'isp', 'isPublicProxy', + 'isResidentialProxy', 'isSatelliteProvider', 'isTorExitNode', + 'mobileCountryCode', + 'mobileNetworkCode', 'network', 'organization', 'staticIpScore', @@ -129,9 +147,9 @@ class Traits extends AbstractRecord 'userType', ]; - public function __construct($record) + public function __construct(?array $record) { - if (!isset($record['network']) && isset($record['ip_address']) && isset($record['prefix_len'])) { + if (!isset($record['network']) && isset($record['ip_address'], $record['prefix_len'])) { $record['network'] = Util::cidr($record['ip_address'], $record['prefix_len']); } diff --git a/vendor/geoip2/geoip2/src/Util.php b/vendor/geoip2/geoip2/src/Util.php index c158fb551..e0a03be8c 100644 --- a/vendor/geoip2/geoip2/src/Util.php +++ b/vendor/geoip2/geoip2/src/Util.php @@ -1,5 +1,7 @@ + */ private $locales; + /** + * @var WsClient + */ private $client; + /** + * @var string + */ private static $basePath = '/geoip/v2.1'; - const VERSION = 'v2.10.0'; + public const VERSION = 'v2.12.2'; /** * Constructor. @@ -57,7 +71,9 @@ class Client implements ProviderInterface * @param array $locales list of locale codes to use in name property * from most preferred to least preferred * @param array $options array of options. Valid options include: - * * `host` - The host to use when querying the web service. + * * `host` - The host to use when querying the web service. To + * query the GeoLite2 web service instead of GeoIP2 Precision, + * set the host to `geolite.info`. * * `timeout` - Timeout in seconds. * * `connectTimeout` - Initial connection timeout in seconds. * * `proxy` - The HTTP proxy to use. May include a schema, port, @@ -65,15 +81,16 @@ class Client implements ProviderInterface * `http://username:password@127.0.0.1:10`. */ public function __construct( - $accountId, - $licenseKey, - $locales = ['en'], - $options = [] + int $accountId, + string $licenseKey, + array $locales = ['en'], + array $options = [] ) { $this->locales = $locales; // This is for backwards compatibility. Do not remove except for a // major version bump. + // @phpstan-ignore-next-line if (\is_string($options)) { $options = ['host' => $options]; } @@ -87,13 +104,13 @@ class Client implements ProviderInterface $this->client = new WsClient($accountId, $licenseKey, $options); } - private function userAgent() + private function userAgent(): string { return 'GeoIP2-API/' . self::VERSION; } /** - * This method calls the GeoIP2 Precision: City service. + * This method calls the City service. * * @param string $ipAddress IPv4 or IPv6 address as a string. If no * address is provided, the address that the web service is called @@ -108,23 +125,22 @@ class Client implements ProviderInterface * @throws \GeoIp2\Exception\InvalidRequestException} if your request was received by the web service but is * invalid for some other reason. This may indicate an issue * with this API. Please report the error to MaxMind. - * @throws \GeoIp2\Exception\HttpException if an unexpected HTTP error code or message was returned. - * This could indicate a problem with the connection between - * your server and the web service or that the web service - * returned an invalid document or 500 error code - * @throws \GeoIp2\Exception\GeoIp2Exception This serves as the parent - * class to the above exceptions. It will be thrown directly - * if a 200 status code is returned but the body is invalid. - * - * @return \GeoIp2\Model\City + * @throws \GeoIp2\Exception\HttpException if an unexpected HTTP error code or message was returned. + * This could indicate a problem with the connection between + * your server and the web service or that the web service + * returned an invalid document or 500 error code + * @throws \GeoIp2\Exception\GeoIp2Exception This serves as the parent + * class to the above exceptions. It will be thrown directly + * if a 200 status code is returned but the body is invalid. */ - public function city($ipAddress = 'me') + public function city(string $ipAddress = 'me'): City { + // @phpstan-ignore-next-line return $this->responseFor('city', 'City', $ipAddress); } /** - * This method calls the GeoIP2 Precision: Country service. + * This method calls the Country service. * * @param string $ipAddress IPv4 or IPv6 address as a string. If no * address is provided, the address that the web service is called @@ -138,24 +154,23 @@ class Client implements ProviderInterface * @throws \GeoIp2\Exception\InvalidRequestException} if your request was received by the web service but is * invalid for some other reason. This may indicate an * issue with this API. Please report the error to MaxMind. - * @throws \GeoIp2\Exception\HttpException if an unexpected HTTP error - * code or message was returned. This could indicate a problem - * with the connection between your server and the web service - * or that the web service returned an invalid document or 500 - * error code. - * @throws \GeoIp2\Exception\GeoIp2Exception This serves as the parent class to the above exceptions. It - * will be thrown directly if a 200 status code is returned but - * the body is invalid. - * - * @return \GeoIp2\Model\Country + * @throws \GeoIp2\Exception\HttpException if an unexpected HTTP error + * code or message was returned. This could indicate a problem + * with the connection between your server and the web service + * or that the web service returned an invalid document or 500 + * error code. + * @throws \GeoIp2\Exception\GeoIp2Exception This serves as the parent class to the above exceptions. It + * will be thrown directly if a 200 status code is returned but + * the body is invalid. */ - public function country($ipAddress = 'me') + public function country(string $ipAddress = 'me'): Country { return $this->responseFor('country', 'Country', $ipAddress); } /** - * This method calls the GeoIP2 Precision: Insights service. + * This method calls the Insights service. Insights is only supported by GeoIP2 + * Precision. The GeoLite2 web service does not support it. * * @param string $ipAddress IPv4 or IPv6 address as a string. If no * address is provided, the address that the web service is called @@ -170,22 +185,21 @@ class Client implements ProviderInterface * @throws \GeoIp2\Exception\InvalidRequestException} if your request was received by the web service but is * invalid for some other reason. This may indicate an * issue with this API. Please report the error to MaxMind. - * @throws \GeoIp2\Exception\HttpException if an unexpected HTTP error code or message was returned. - * This could indicate a problem with the connection between - * your server and the web service or that the web service - * returned an invalid document or 500 error code - * @throws \GeoIp2\Exception\GeoIp2Exception This serves as the parent - * class to the above exceptions. It will be thrown directly - * if a 200 status code is returned but the body is invalid. - * - * @return \GeoIp2\Model\Insights + * @throws \GeoIp2\Exception\HttpException if an unexpected HTTP error code or message was returned. + * This could indicate a problem with the connection between + * your server and the web service or that the web service + * returned an invalid document or 500 error code + * @throws \GeoIp2\Exception\GeoIp2Exception This serves as the parent + * class to the above exceptions. It will be thrown directly + * if a 200 status code is returned but the body is invalid. */ - public function insights($ipAddress = 'me') + public function insights(string $ipAddress = 'me'): Insights { + // @phpstan-ignore-next-line return $this->responseFor('insights', 'Insights', $ipAddress); } - private function responseFor($endpoint, $class, $ipAddress) + private function responseFor(string $endpoint, string $class, string $ipAddress): Country { $path = implode('/', [self::$basePath, $endpoint, $ipAddress]); diff --git a/vendor/guzzlehttp/promises/CHANGELOG.md b/vendor/guzzlehttp/promises/CHANGELOG.md index 14796c472..235e13bc7 100644 --- a/vendor/guzzlehttp/promises/CHANGELOG.md +++ b/vendor/guzzlehttp/promises/CHANGELOG.md @@ -1,7 +1,26 @@ # CHANGELOG +## 1.5.1 - 2021-10-22 + +### Fixed + +- Revert "Call handler when waiting on fulfilled/rejected Promise" +- Fix pool memory leak when empty array of promises provided + +## 1.5.0 - 2021-10-07 + +### Changed + +- Call handler when waiting on fulfilled/rejected Promise + +### Fixed + +- Fix manually settle promises generated with Utils::task + ## 1.4.1 - 2021-02-18 +### Fixed + - Fixed `each_limit` skipping promises and failing ## 1.4.0 - 2020-09-30 diff --git a/vendor/guzzlehttp/promises/LICENSE b/vendor/guzzlehttp/promises/LICENSE index 67f91a14c..9f0f943be 100644 --- a/vendor/guzzlehttp/promises/LICENSE +++ b/vendor/guzzlehttp/promises/LICENSE @@ -1,4 +1,9 @@ -Copyright (c) 2015-2016 Michael Dowling, https://github.com/mtdowling +The MIT License (MIT) + +Copyright (c) 2015 Michael Dowling +Copyright (c) 2015 Graham Campbell +Copyright (c) 2017 Tobias Schultze +Copyright (c) 2020 Tobias Nyholm Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/vendor/guzzlehttp/promises/README.md b/vendor/guzzlehttp/promises/README.md index a95c60594..c175fec76 100644 --- a/vendor/guzzlehttp/promises/README.md +++ b/vendor/guzzlehttp/promises/README.md @@ -530,3 +530,18 @@ A static API was first introduced in 1.4.0, in order to mitigate problems with f | `is_rejected` | `Is::rejected` | | `is_settled` | `Is::settled` | | `coroutine` | `Coroutine::of` | + + +## Security + +If you discover a security vulnerability within this package, please send an email to security@tidelift.com. All security vulnerabilities will be promptly addressed. Please do not disclose security-related issues publicly until a fix has been announced. Please see [Security Policy](https://github.com/guzzle/promises/security/policy) for more information. + +## License + +Guzzle is made available under the MIT License (MIT). Please see [License File](LICENSE) for more information. + +## For Enterprise + +Available as part of the Tidelift Subscription + +The maintainers of Guzzle and thousands of other packages are working with Tidelift to deliver commercial support and maintenance for the open source dependencies you use to build your applications. Save time, reduce risk, and improve code health, while paying the maintainers of the exact dependencies you use. [Learn more.](https://tidelift.com/subscription/pkg/packagist-guzzlehttp-promises?utm_source=packagist-guzzlehttp-promises&utm_medium=referral&utm_campaign=enterprise&utm_term=repo) diff --git a/vendor/guzzlehttp/promises/composer.json b/vendor/guzzlehttp/promises/composer.json index db44d9e3f..c959fb32b 100644 --- a/vendor/guzzlehttp/promises/composer.json +++ b/vendor/guzzlehttp/promises/composer.json @@ -4,10 +4,25 @@ "keywords": ["promise"], "license": "MIT", "authors": [ + { + "name": "Graham Campbell", + "email": "hello@gjcampbell.co.uk", + "homepage": "https://github.com/GrahamCampbell" + }, { "name": "Michael Dowling", "email": "mtdowling@gmail.com", "homepage": "https://github.com/mtdowling" + }, + { + "name": "Tobias Nyholm", + "email": "tobias.nyholm@gmail.com", + "homepage": "https://github.com/Nyholm" + }, + { + "name": "Tobias Schultze", + "email": "webmaster@tubo-world.de", + "homepage": "https://github.com/Tobion" } ], "require": { @@ -33,7 +48,11 @@ }, "extra": { "branch-alias": { - "dev-master": "1.4-dev" + "dev-master": "1.5-dev" } + }, + "config": { + "preferred-install": "dist", + "sort-packages": true } } diff --git a/vendor/guzzlehttp/promises/src/EachPromise.php b/vendor/guzzlehttp/promises/src/EachPromise.php index 748f4712c..38ecb59b1 100644 --- a/vendor/guzzlehttp/promises/src/EachPromise.php +++ b/vendor/guzzlehttp/promises/src/EachPromise.php @@ -79,9 +79,7 @@ class EachPromise implements PromisorInterface $this->createPromise(); /** @psalm-assert Promise $this->aggregate */ $this->iterable->rewind(); - if (!$this->checkIfFinished()) { - $this->refillPending(); - } + $this->refillPending(); } catch (\Throwable $e) { /** * @psalm-suppress NullReference @@ -107,6 +105,9 @@ class EachPromise implements PromisorInterface { $this->mutex = false; $this->aggregate = new Promise(function () { + if ($this->checkIfFinished()) { + return; + } reset($this->pending); // Consume a potentially fluctuating list of promises while // ensuring that indexes are maintained (precluding array_shift). diff --git a/vendor/guzzlehttp/promises/src/Utils.php b/vendor/guzzlehttp/promises/src/Utils.php index 1cee86202..8647126d8 100644 --- a/vendor/guzzlehttp/promises/src/Utils.php +++ b/vendor/guzzlehttp/promises/src/Utils.php @@ -48,7 +48,9 @@ final class Utils $promise = new Promise([$queue, 'run']); $queue->add(function () use ($task, $promise) { try { - $promise->resolve($task()); + if (Is::pending($promise)) { + $promise->resolve($task()); + } } catch (\Throwable $e) { $promise->reject($e); } catch (\Exception $e) { diff --git a/vendor/guzzlehttp/psr7/.github/FUNDING.yml b/vendor/guzzlehttp/psr7/.github/FUNDING.yml new file mode 100644 index 000000000..7d222c582 --- /dev/null +++ b/vendor/guzzlehttp/psr7/.github/FUNDING.yml @@ -0,0 +1,2 @@ +github: [Nyholm, GrahamCampbell] +tidelift: "packagist/guzzlehttp/psr7" diff --git a/vendor/guzzlehttp/psr7/.github/stale.yml b/vendor/guzzlehttp/psr7/.github/stale.yml new file mode 100644 index 000000000..53faa71bd --- /dev/null +++ b/vendor/guzzlehttp/psr7/.github/stale.yml @@ -0,0 +1,14 @@ +daysUntilStale: 120 +daysUntilClose: 14 +exemptLabels: + - lifecycle/keep-open + - lifecycle/ready-for-merge +# Label to use when marking an issue as stale +staleLabel: lifecycle/stale +# Comment to post when marking an issue as stale. Set to `false` to disable +markComment: > + This issue has been automatically marked as stale because it has not had + recent activity. It will be closed after 2 weeks if no further activity occurs. Thank you + for your contributions. +# Comment to post when closing a stale issue. Set to `false` to disable +closeComment: false diff --git a/vendor/guzzlehttp/psr7/.github/workflows/bc.yml b/vendor/guzzlehttp/psr7/.github/workflows/bc.yml deleted file mode 100644 index 9eaedbce7..000000000 --- a/vendor/guzzlehttp/psr7/.github/workflows/bc.yml +++ /dev/null @@ -1,16 +0,0 @@ -name: BC Check - -on: - pull_request: - -jobs: - roave-bc-check: - name: Roave BC Check - runs-on: ubuntu-latest - - steps: - - name: Checkout code - uses: actions/checkout@v2 - - - name: Roave BC Check - uses: docker://nyholm/roave-bc-check-ga diff --git a/vendor/guzzlehttp/psr7/.github/workflows/ci.yml b/vendor/guzzlehttp/psr7/.github/workflows/ci.yml index da7414e57..eda7dceb5 100644 --- a/vendor/guzzlehttp/psr7/.github/workflows/ci.yml +++ b/vendor/guzzlehttp/psr7/.github/workflows/ci.yml @@ -10,7 +10,7 @@ jobs: strategy: max-parallel: 10 matrix: - php: ['5.6', '7.0', '7.1', '7.2', '7.3', '7.4'] + php: ['5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1'] steps: - name: Set up PHP @@ -23,8 +23,12 @@ jobs: - name: Checkout code uses: actions/checkout@v2 + - name: Mimic PHP 8.0 + run: composer config platform.php 8.0.999 + if: matrix.php > 8 + - name: Install dependencies - run: composer update --no-interaction --no-progress --prefer-dist + run: composer update --no-interaction --no-progress - name: Run tests run: make test diff --git a/vendor/guzzlehttp/psr7/.github/workflows/integration.yml b/vendor/guzzlehttp/psr7/.github/workflows/integration.yml index b6e0eb241..3c31f9ef2 100644 --- a/vendor/guzzlehttp/psr7/.github/workflows/integration.yml +++ b/vendor/guzzlehttp/psr7/.github/workflows/integration.yml @@ -26,7 +26,7 @@ jobs: - name: Download dependencies uses: ramsey/composer-install@v1 with: - composer-options: --no-interaction --prefer-dist --optimize-autoloader + composer-options: --no-interaction --optimize-autoloader - name: Start server run: php -S 127.0.0.1:10002 tests/Integration/server.php & diff --git a/vendor/guzzlehttp/psr7/CHANGELOG.md b/vendor/guzzlehttp/psr7/CHANGELOG.md index 6a6b7bf98..f40736c4e 100644 --- a/vendor/guzzlehttp/psr7/CHANGELOG.md +++ b/vendor/guzzlehttp/psr7/CHANGELOG.md @@ -9,6 +9,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## Unreleased +## 1.8.3 - 2021-10-05 + +### Fixed + +- Return `null` in caching stream size if remote size is `null` + ## 1.8.2 - 2021-04-26 ### Fixed diff --git a/vendor/guzzlehttp/psr7/LICENSE b/vendor/guzzlehttp/psr7/LICENSE index 581d95f92..51c7ec81c 100644 --- a/vendor/guzzlehttp/psr7/LICENSE +++ b/vendor/guzzlehttp/psr7/LICENSE @@ -1,4 +1,11 @@ -Copyright (c) 2015 Michael Dowling, https://github.com/mtdowling +The MIT License (MIT) + +Copyright (c) 2015 Michael Dowling +Copyright (c) 2015 Márk Sági-Kazár +Copyright (c) 2015 Graham Campbell +Copyright (c) 2016 Tobias Schultze +Copyright (c) 2016 George Mponos +Copyright (c) 2018 Tobias Nyholm Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/vendor/guzzlehttp/psr7/README.md b/vendor/guzzlehttp/psr7/README.md index acfabfdcb..464cae4f2 100644 --- a/vendor/guzzlehttp/psr7/README.md +++ b/vendor/guzzlehttp/psr7/README.md @@ -807,3 +807,18 @@ Whether two URIs can be considered equivalent. Both URIs are normalized automati `$normalizations` bitmask. The method also accepts relative URI references and returns true when they are equivalent. This of course assumes they will be resolved against the same base URI. If this is not the case, determination of equivalence or difference of relative references does not mean anything. + + +## Security + +If you discover a security vulnerability within this package, please send an email to security@tidelift.com. All security vulnerabilities will be promptly addressed. Please do not disclose security-related issues publicly until a fix has been announced. Please see [Security Policy](https://github.com/guzzle/psr7/security/policy) for more information. + +## License + +Guzzle is made available under the MIT License (MIT). Please see [License File](LICENSE) for more information. + +## For Enterprise + +Available as part of the Tidelift Subscription + +The maintainers of Guzzle and thousands of other packages are working with Tidelift to deliver commercial support and maintenance for the open source dependencies you use to build your applications. Save time, reduce risk, and improve code health, while paying the maintainers of the exact dependencies you use. [Learn more.](https://tidelift.com/subscription/pkg/packagist-guzzlehttp-psr7?utm_source=packagist-guzzlehttp-psr7&utm_medium=referral&utm_campaign=enterprise&utm_term=repo) diff --git a/vendor/guzzlehttp/psr7/composer.json b/vendor/guzzlehttp/psr7/composer.json index 58dcb07e4..bfa7cfdc1 100644 --- a/vendor/guzzlehttp/psr7/composer.json +++ b/vendor/guzzlehttp/psr7/composer.json @@ -1,17 +1,37 @@ { "name": "guzzlehttp/psr7", - "type": "library", "description": "PSR-7 message implementation that also provides common utility methods", "keywords": ["request", "response", "message", "stream", "http", "uri", "url", "psr-7"], "license": "MIT", "authors": [ + { + "name": "Graham Campbell", + "email": "hello@gjcampbell.co.uk", + "homepage": "https://github.com/GrahamCampbell" + }, { "name": "Michael Dowling", "email": "mtdowling@gmail.com", "homepage": "https://github.com/mtdowling" }, + { + "name": "George Mponos", + "email": "gmponos@gmail.com", + "homepage": "https://github.com/gmponos" + }, + { + "name": "Tobias Nyholm", + "email": "tobias.nyholm@gmail.com", + "homepage": "https://github.com/Nyholm" + }, + { + "name": "Márk Sági-Kazár", + "email": "mark.sagikazar@gmail.com", + "homepage": "https://github.com/sagikazarmark" + }, { "name": "Tobias Schultze", + "email": "webmaster@tubo-world.de", "homepage": "https://github.com/Tobion" } ], @@ -45,5 +65,9 @@ "branch-alias": { "dev-master": "1.7-dev" } + }, + "config": { + "preferred-install": "dist", + "sort-packages": true } } diff --git a/vendor/guzzlehttp/psr7/src/CachingStream.php b/vendor/guzzlehttp/psr7/src/CachingStream.php index fe749e981..febade9f4 100644 --- a/vendor/guzzlehttp/psr7/src/CachingStream.php +++ b/vendor/guzzlehttp/psr7/src/CachingStream.php @@ -36,7 +36,13 @@ class CachingStream implements StreamInterface public function getSize() { - return max($this->stream->getSize(), $this->remoteStream->getSize()); + $remoteSize = $this->remoteStream->getSize(); + + if (null === $remoteSize) { + return null; + } + + return max($this->stream->getSize(), $remoteSize); } public function rewind() diff --git a/vendor/maxmind-db/reader/CHANGELOG.md b/vendor/maxmind-db/reader/CHANGELOG.md index 7b7497877..4c89f0cc9 100644 --- a/vendor/maxmind-db/reader/CHANGELOG.md +++ b/vendor/maxmind-db/reader/CHANGELOG.md @@ -1,6 +1,14 @@ CHANGELOG ========= +1.11.0 +------------------- + +* Replace runtime define of a constant to facilitate opcache preloading. + Reported by vedadkajtaz. GitHub #134. +* Resolve minor issue found by the Clang static analyzer in the C + extension. + 1.10.1 (2021-04-14) ------------------- diff --git a/vendor/maxmind-db/reader/README.md b/vendor/maxmind-db/reader/README.md index d0600e871..49fa28001 100644 --- a/vendor/maxmind-db/reader/README.md +++ b/vendor/maxmind-db/reader/README.md @@ -112,9 +112,16 @@ you are using an autoloader, no changes to your code should be necessary. First install [libmaxminddb](https://github.com/maxmind/libmaxminddb) as described in its [README.md -file](https://github.com/maxmind/libmaxminddb/blob/master/README.md#installing-from-a-tarball). -After successfully installing libmaxmindb, run the following commands from the -top-level directory of this distribution: +file](https://github.com/maxmind/libmaxminddb/blob/main/README.md#installing-from-a-tarball). +After successfully installing libmaxmindb, you may install the extension +from [pecl](https://pecl.php.net/package/maxminddb): + +``` +pecl install maxminddb +``` + +Alternatively, you may install it from the source. To do so, run the following +commands from the top-level directory of this distribution: ``` cd ext @@ -157,7 +164,7 @@ client API, please see [our support page](https://www.maxmind.com/en/support). ## Requirements ## -This library requires PHP 5.6 or greater. +This library requires PHP 7.2 or greater. The GMP or BCMath extension may be required to read some databases using the pure PHP API. @@ -173,6 +180,6 @@ The MaxMind DB Reader PHP API uses [Semantic Versioning](https://semver.org/). ## Copyright and License ## -This software is Copyright (c) 2014-2019 by MaxMind, Inc. +This software is Copyright (c) 2014-2020 by MaxMind, Inc. This is free software, licensed under the Apache License, Version 2.0. diff --git a/vendor/maxmind-db/reader/autoload.php b/vendor/maxmind-db/reader/autoload.php index 1314b698e..a1119e7f8 100644 --- a/vendor/maxmind-db/reader/autoload.php +++ b/vendor/maxmind-db/reader/autoload.php @@ -1,5 +1,7 @@ __DIR__ . '/src/MaxMind/Db/']; foreach ($namespace_map as $prefix => $dir) { - /* First swap out the namespace prefix with a directory... */ + // First swap out the namespace prefix with a directory... $path = str_replace($prefix, $dir, $class); - /* replace the namespace separator with a directory separator... */ + // replace the namespace separator with a directory separator... $path = str_replace('\\', '/', $path); - /* and finally, add the PHP file extension to the result. */ + // and finally, add the PHP file extension to the result. $path = $path . '.php'; - /* $path should now contain the path to a PHP file defining $class */ + // $path should now contain the path to a PHP file defining $class if (file_exists($path)) { include $path; } diff --git a/vendor/maxmind-db/reader/composer.json b/vendor/maxmind-db/reader/composer.json index 8d9f9d506..26d487301 100644 --- a/vendor/maxmind-db/reader/composer.json +++ b/vendor/maxmind-db/reader/composer.json @@ -24,7 +24,7 @@ "ext-maxminddb": "<1.10.1,>=2.0.0" }, "require-dev": { - "friendsofphp/php-cs-fixer": "*", + "friendsofphp/php-cs-fixer": "3.*", "phpunit/phpunit": ">=8.0.0,<10.0.0", "php-coveralls/php-coveralls": "^2.1", "phpunit/phpcov": ">=6.0.0", diff --git a/vendor/maxmind-db/reader/ext/config.w32 b/vendor/maxmind-db/reader/ext/config.w32 new file mode 100644 index 000000000..4eb18f849 --- /dev/null +++ b/vendor/maxmind-db/reader/ext/config.w32 @@ -0,0 +1,10 @@ +ARG_WITH("maxminddb", "Enable MaxMind DB Reader extension support", "no"); + +if (PHP_MAXMINDDB == "yes") { + if (CHECK_HEADER_ADD_INCLUDE("maxminddb.h", "CFLAGS_MAXMINDDB", PHP_MAXMINDDB + ";" + PHP_PHP_BUILD + "\\include\\maxminddb") && + CHECK_LIB("libmaxminddb.lib", "maxminddb", PHP_MAXMINDDB)) { + EXTENSION("maxminddb", "maxminddb.c"); + } else { + WARNING('Could not find maxminddb.h or libmaxminddb.lib; skipping'); + } +} diff --git a/vendor/maxmind-db/reader/ext/maxminddb.c b/vendor/maxmind-db/reader/ext/maxminddb.c index a97a3d9e4..b00b2fa3d 100644 --- a/vendor/maxmind-db/reader/ext/maxminddb.c +++ b/vendor/maxmind-db/reader/ext/maxminddb.c @@ -21,6 +21,8 @@ #include #include "Zend/zend_exceptions.h" +#include "Zend/zend_types.h" +#include "ext/spl/spl_exceptions.h" #include "ext/standard/info.h" #include @@ -33,50 +35,50 @@ #define PHP_MAXMINDDB_NS ZEND_NS_NAME("MaxMind", "Db") #define PHP_MAXMINDDB_READER_NS ZEND_NS_NAME(PHP_MAXMINDDB_NS, "Reader") +#define PHP_MAXMINDDB_METADATA_NS \ + ZEND_NS_NAME(PHP_MAXMINDDB_READER_NS, "Metadata") #define PHP_MAXMINDDB_READER_EX_NS \ ZEND_NS_NAME(PHP_MAXMINDDB_READER_NS, "InvalidDatabaseException") -#ifdef ZEND_ENGINE_3 #define Z_MAXMINDDB_P(zv) php_maxminddb_fetch_object(Z_OBJ_P(zv)) -#define _ZVAL_STRING ZVAL_STRING -#define _ZVAL_STRINGL ZVAL_STRINGL typedef size_t strsize_t; typedef zend_object free_obj_t; -#else -#define Z_MAXMINDDB_P(zv) \ - (maxminddb_obj *)zend_object_store_get_object(zv TSRMLS_CC) -#define _ZVAL_STRING(a, b) ZVAL_STRING(a, b, 1) -#define _ZVAL_STRINGL(a, b, c) ZVAL_STRINGL(a, b, c, 1) -typedef int strsize_t; -typedef void free_obj_t; -#endif /* For PHP 8 compatibility */ -#ifndef TSRMLS_C +#if PHP_VERSION_ID < 80000 + +#define PROP_OBJ(zv) (zv) + +#else + +#define PROP_OBJ(zv) Z_OBJ_P(zv) + #define TSRMLS_C -#endif -#ifndef TSRMLS_CC #define TSRMLS_CC -#endif -#ifndef TSRMLS_DC #define TSRMLS_DC + +/* End PHP 8 compatibility */ #endif + #ifndef ZEND_ACC_CTOR #define ZEND_ACC_CTOR 0 #endif -#ifdef ZEND_ENGINE_3 -typedef struct _maxminddb_obj { - MMDB_s *mmdb; - zend_object std; -} maxminddb_obj; -#else -typedef struct _maxminddb_obj { - zend_object std; - MMDB_s *mmdb; -} maxminddb_obj; +/* IS_MIXED was added in 2020 */ +#ifndef IS_MIXED +#define IS_MIXED IS_UNDEF #endif +/* ZEND_THIS was added in 7.4 */ +#ifndef ZEND_THIS +#define ZEND_THIS (&EX(This)) +#endif + +typedef struct _maxminddb_obj { + MMDB_s *mmdb; + zend_object std; +} maxminddb_obj; + PHP_FUNCTION(maxminddb); static int @@ -96,7 +98,6 @@ static void handle_uint64(const MMDB_entry_data_list_s *entry_data_list, zval *z_value TSRMLS_DC); static void handle_uint32(const MMDB_entry_data_list_s *entry_data_list, zval *z_value TSRMLS_DC); -static zend_class_entry *lookup_class(const char *name TSRMLS_DC); #define CHECK_ALLOCATED(val) \ if (!val) { \ @@ -104,38 +105,16 @@ static zend_class_entry *lookup_class(const char *name TSRMLS_DC); return; \ } -#define THROW_EXCEPTION(name, ...) \ - { \ - zend_class_entry *exception_ce = lookup_class(name TSRMLS_CC); \ - zend_throw_exception_ex(exception_ce, 0 TSRMLS_CC, __VA_ARGS__); \ - } - -#if PHP_VERSION_ID < 50399 -#define object_properties_init(zo, class_type) \ - { \ - zval *tmp; \ - zend_hash_copy((*zo).properties, \ - &class_type->default_properties, \ - (copy_ctor_func_t)zval_add_ref, \ - (void *)&tmp, \ - sizeof(zval *)); \ - } -#endif - static zend_object_handlers maxminddb_obj_handlers; -static zend_class_entry *maxminddb_ce; +static zend_class_entry *maxminddb_ce, *maxminddb_exception_ce, *metadata_ce; static inline maxminddb_obj * php_maxminddb_fetch_object(zend_object *obj TSRMLS_DC) { -#ifdef ZEND_ENGINE_3 return (maxminddb_obj *)((char *)(obj)-XtOffsetOf(maxminddb_obj, std)); -#else - return (maxminddb_obj *)obj; -#endif } -ZEND_BEGIN_ARG_INFO_EX(arginfo_maxmindbreader_construct, 0, 0, 1) -ZEND_ARG_INFO(0, db_file) +ZEND_BEGIN_ARG_INFO_EX(arginfo_maxminddbreader_construct, 0, 0, 1) +ZEND_ARG_TYPE_INFO(0, db_file, IS_STRING, 0) ZEND_END_ARG_INFO() PHP_METHOD(MaxMind_Db_Reader, __construct) { @@ -150,16 +129,16 @@ PHP_METHOD(MaxMind_Db_Reader, __construct) { maxminddb_ce, &db_file, &name_len) == FAILURE) { - THROW_EXCEPTION("InvalidArgumentException", - "The constructor takes exactly one argument."); return; } if (0 != php_check_open_basedir(db_file TSRMLS_CC) || 0 != access(db_file, R_OK)) { - THROW_EXCEPTION("InvalidArgumentException", - "The file \"%s\" does not exist or is not readable.", - db_file); + zend_throw_exception_ex( + spl_ce_InvalidArgumentException, + 0 TSRMLS_CC, + "The file \"%s\" does not exist or is not readable.", + db_file); return; } @@ -167,20 +146,23 @@ PHP_METHOD(MaxMind_Db_Reader, __construct) { uint16_t status = MMDB_open(db_file, MMDB_MODE_MMAP, mmdb); if (MMDB_SUCCESS != status) { - THROW_EXCEPTION(PHP_MAXMINDDB_READER_EX_NS, - "Error opening database file (%s). Is this a valid " - "MaxMind DB file?", - db_file); + zend_throw_exception_ex( + maxminddb_exception_ce, + 0 TSRMLS_CC, + "Error opening database file (%s). Is this a valid " + "MaxMind DB file?", + db_file); efree(mmdb); return; } - maxminddb_obj *mmdb_obj = Z_MAXMINDDB_P(getThis()); + maxminddb_obj *mmdb_obj = Z_MAXMINDDB_P(ZEND_THIS); mmdb_obj->mmdb = mmdb; } -ZEND_BEGIN_ARG_INFO_EX(arginfo_maxmindbreader_get, 0, 0, 1) -ZEND_ARG_INFO(0, ip_address) +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX( + arginfo_maxminddbreader_get, 0, 1, IS_MIXED, 1) +ZEND_ARG_TYPE_INFO(0, ip_address, IS_STRING, 0) ZEND_END_ARG_INFO() PHP_METHOD(MaxMind_Db_Reader, get) { @@ -188,76 +170,75 @@ PHP_METHOD(MaxMind_Db_Reader, get) { get_record(INTERNAL_FUNCTION_PARAM_PASSTHRU, return_value, &prefix_len); } +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX( + arginfo_maxminddbreader_getWithPrefixLen, 0, 1, IS_ARRAY, 1) +ZEND_ARG_TYPE_INFO(0, ip_address, IS_STRING, 0) +ZEND_END_ARG_INFO() + PHP_METHOD(MaxMind_Db_Reader, getWithPrefixLen) { - zval *record, *z_prefix_len; -#ifdef ZEND_ENGINE_3 - zval _record, _z_prefix_len; - record = &_record; - z_prefix_len = &_z_prefix_len; -#else - ALLOC_INIT_ZVAL(record); - ALLOC_INIT_ZVAL(z_prefix_len); -#endif + zval record, z_prefix_len; int prefix_len = 0; - if (get_record(INTERNAL_FUNCTION_PARAM_PASSTHRU, record, &prefix_len)) { + if (get_record(INTERNAL_FUNCTION_PARAM_PASSTHRU, &record, &prefix_len) == + FAILURE) { return; } array_init(return_value); - add_next_index_zval(return_value, record); + add_next_index_zval(return_value, &record); - ZVAL_LONG(z_prefix_len, prefix_len); - add_next_index_zval(return_value, z_prefix_len); + ZVAL_LONG(&z_prefix_len, prefix_len); + add_next_index_zval(return_value, &z_prefix_len); } static int get_record(INTERNAL_FUNCTION_PARAMETERS, zval *record, int *prefix_len) { char *ip_address = NULL; strsize_t name_len; - zval *_this_zval = NULL; + zval *this_zval = NULL; if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", - &_this_zval, + &this_zval, maxminddb_ce, &ip_address, &name_len) == FAILURE) { - THROW_EXCEPTION("InvalidArgumentException", - "Method takes exactly one argument."); - return 1; + return FAILURE; } - const maxminddb_obj *mmdb_obj = (maxminddb_obj *)Z_MAXMINDDB_P(getThis()); + const maxminddb_obj *mmdb_obj = (maxminddb_obj *)Z_MAXMINDDB_P(ZEND_THIS); MMDB_s *mmdb = mmdb_obj->mmdb; if (NULL == mmdb) { - THROW_EXCEPTION("BadMethodCallException", - "Attempt to read from a closed MaxMind DB."); - return 1; + zend_throw_exception_ex(spl_ce_BadMethodCallException, + 0 TSRMLS_CC, + "Attempt to read from a closed MaxMind DB."); + return FAILURE; } struct addrinfo hints = { .ai_family = AF_UNSPEC, .ai_flags = AI_NUMERICHOST, - // We set ai_socktype so that we only get one result back + /* We set ai_socktype so that we only get one result back */ .ai_socktype = SOCK_STREAM}; struct addrinfo *addresses = NULL; int gai_status = getaddrinfo(ip_address, NULL, &hints, &addresses); if (gai_status) { - THROW_EXCEPTION("InvalidArgumentException", - "The value \"%s\" is not a valid IP address.", - ip_address); - return 1; + zend_throw_exception_ex(spl_ce_InvalidArgumentException, + 0 TSRMLS_CC, + "The value \"%s\" is not a valid IP address.", + ip_address); + return FAILURE; } if (!addresses || !addresses->ai_addr) { - THROW_EXCEPTION( - "InvalidArgumentException", + zend_throw_exception_ex( + spl_ce_InvalidArgumentException, + 0 TSRMLS_CC, "getaddrinfo was successful but failed to set the addrinfo"); - return 1; + return FAILURE; } int sa_family = addresses->ai_addr->sa_family; @@ -269,132 +250,127 @@ get_record(INTERNAL_FUNCTION_PARAMETERS, zval *record, int *prefix_len) { freeaddrinfo(addresses); if (MMDB_SUCCESS != mmdb_error) { - char *exception_name; + zend_class_entry *ex; if (MMDB_IPV6_LOOKUP_IN_IPV4_DATABASE_ERROR == mmdb_error) { - exception_name = "InvalidArgumentException"; + ex = spl_ce_InvalidArgumentException; } else { - exception_name = PHP_MAXMINDDB_READER_EX_NS; + ex = maxminddb_exception_ce; } - THROW_EXCEPTION(exception_name, - "Error looking up %s. %s", - ip_address, - MMDB_strerror(mmdb_error)); - return 1; + zend_throw_exception_ex(ex, + 0 TSRMLS_CC, + "Error looking up %s. %s", + ip_address, + MMDB_strerror(mmdb_error)); + return FAILURE; } *prefix_len = result.netmask; if (sa_family == AF_INET && mmdb->metadata.ip_version == 6) { - // We return the prefix length given the IPv4 address. If there is - // no IPv4 subtree, we return a prefix length of 0. + /* We return the prefix length given the IPv4 address. If there is + no IPv4 subtree, we return a prefix length of 0. */ *prefix_len = *prefix_len >= 96 ? *prefix_len - 96 : 0; } if (!result.found_entry) { ZVAL_NULL(record); - return 0; + return SUCCESS; } MMDB_entry_data_list_s *entry_data_list = NULL; int status = MMDB_get_entry_data_list(&result.entry, &entry_data_list); if (MMDB_SUCCESS != status) { - THROW_EXCEPTION(PHP_MAXMINDDB_READER_EX_NS, - "Error while looking up data for %s. %s", - ip_address, - MMDB_strerror(status)); + zend_throw_exception_ex(maxminddb_exception_ce, + 0 TSRMLS_CC, + "Error while looking up data for %s. %s", + ip_address, + MMDB_strerror(status)); MMDB_free_entry_data_list(entry_data_list); - return 1; + return FAILURE; } else if (NULL == entry_data_list) { - THROW_EXCEPTION(PHP_MAXMINDDB_READER_EX_NS, - "Error while looking up data for %s. Your database may " - "be corrupt or you have found a bug in libmaxminddb.", - ip_address); - return 1; + zend_throw_exception_ex( + maxminddb_exception_ce, + 0 TSRMLS_CC, + "Error while looking up data for %s. Your database may " + "be corrupt or you have found a bug in libmaxminddb.", + ip_address); + return FAILURE; } - handle_entry_data_list(entry_data_list, record TSRMLS_CC); + const MMDB_entry_data_list_s *rv = + handle_entry_data_list(entry_data_list, record TSRMLS_CC); + if (rv == NULL) { + /* We should have already thrown the exception in handle_entry_data_list + */ + return FAILURE; + } MMDB_free_entry_data_list(entry_data_list); - return 0; + return SUCCESS; } -ZEND_BEGIN_ARG_INFO_EX(arginfo_maxmindbreader_void, 0, 0, 0) +ZEND_BEGIN_ARG_INFO_EX(arginfo_maxminddbreader_void, 0, 0, 0) ZEND_END_ARG_INFO() PHP_METHOD(MaxMind_Db_Reader, metadata) { - if (ZEND_NUM_ARGS() != 0) { - THROW_EXCEPTION("InvalidArgumentException", - "Method takes no arguments."); + zval *this_zval = NULL; + + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, + getThis(), + "O", + &this_zval, + maxminddb_ce) == FAILURE) { return; } const maxminddb_obj *const mmdb_obj = - (maxminddb_obj *)Z_MAXMINDDB_P(getThis()); + (maxminddb_obj *)Z_MAXMINDDB_P(this_zval); if (NULL == mmdb_obj->mmdb) { - THROW_EXCEPTION("BadMethodCallException", - "Attempt to read from a closed MaxMind DB."); + zend_throw_exception_ex(spl_ce_BadMethodCallException, + 0 TSRMLS_CC, + "Attempt to read from a closed MaxMind DB."); return; } - const char *const name = ZEND_NS_NAME(PHP_MAXMINDDB_READER_NS, "Metadata"); - zend_class_entry *metadata_ce = lookup_class(name TSRMLS_CC); - object_init_ex(return_value, metadata_ce); -#ifdef ZEND_ENGINE_3 - zval _metadata_array; - zval *metadata_array = &_metadata_array; - ZVAL_NULL(metadata_array); -#else - zval *metadata_array; - ALLOC_INIT_ZVAL(metadata_array); -#endif - MMDB_entry_data_list_s *entry_data_list; MMDB_get_metadata_as_entry_data_list(mmdb_obj->mmdb, &entry_data_list); - handle_entry_data_list(entry_data_list, metadata_array TSRMLS_CC); + zval metadata_array; + const MMDB_entry_data_list_s *rv = + handle_entry_data_list(entry_data_list, &metadata_array TSRMLS_CC); + if (rv == NULL) { + return; + } MMDB_free_entry_data_list(entry_data_list); -#if PHP_VERSION_ID >= 80000 - zend_call_method_with_1_params(Z_OBJ_P(return_value), + zend_call_method_with_1_params(PROP_OBJ(return_value), metadata_ce, &metadata_ce->constructor, ZEND_CONSTRUCTOR_FUNC_NAME, NULL, - metadata_array); - zval_ptr_dtor(metadata_array); -#elif defined(ZEND_ENGINE_3) - zend_call_method_with_1_params(return_value, - metadata_ce, - &metadata_ce->constructor, - ZEND_CONSTRUCTOR_FUNC_NAME, - NULL, - metadata_array); - zval_ptr_dtor(metadata_array); -#else - zend_call_method_with_1_params(&return_value, - metadata_ce, - &metadata_ce->constructor, - ZEND_CONSTRUCTOR_FUNC_NAME, - NULL, - metadata_array); + &metadata_array); zval_ptr_dtor(&metadata_array); -#endif } PHP_METHOD(MaxMind_Db_Reader, close) { - if (ZEND_NUM_ARGS() != 0) { - THROW_EXCEPTION("InvalidArgumentException", - "Method takes no arguments."); + zval *this_zval = NULL; + + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, + getThis(), + "O", + &this_zval, + maxminddb_ce) == FAILURE) { return; } - maxminddb_obj *mmdb_obj = (maxminddb_obj *)Z_MAXMINDDB_P(getThis()); + maxminddb_obj *mmdb_obj = (maxminddb_obj *)Z_MAXMINDDB_P(this_zval); if (NULL == mmdb_obj->mmdb) { - THROW_EXCEPTION("BadMethodCallException", - "Attempt to close a closed MaxMind DB."); + zend_throw_exception_ex(spl_ce_BadMethodCallException, + 0 TSRMLS_CC, + "Attempt to close a closed MaxMind DB."); return; } MMDB_close(mmdb_obj->mmdb); @@ -411,14 +387,14 @@ handle_entry_data_list(const MMDB_entry_data_list_s *entry_data_list, case MMDB_DATA_TYPE_ARRAY: return handle_array(entry_data_list, z_value TSRMLS_CC); case MMDB_DATA_TYPE_UTF8_STRING: - _ZVAL_STRINGL(z_value, - (char *)entry_data_list->entry_data.utf8_string, - entry_data_list->entry_data.data_size); + ZVAL_STRINGL(z_value, + (char *)entry_data_list->entry_data.utf8_string, + entry_data_list->entry_data.data_size); break; case MMDB_DATA_TYPE_BYTES: - _ZVAL_STRINGL(z_value, - (char *)entry_data_list->entry_data.bytes, - entry_data_list->entry_data.data_size); + ZVAL_STRINGL(z_value, + (char *)entry_data_list->entry_data.bytes, + entry_data_list->entry_data.data_size); break; case MMDB_DATA_TYPE_DOUBLE: ZVAL_DOUBLE(z_value, entry_data_list->entry_data.double_value); @@ -445,9 +421,10 @@ handle_entry_data_list(const MMDB_entry_data_list_s *entry_data_list, ZVAL_LONG(z_value, entry_data_list->entry_data.int32); break; default: - THROW_EXCEPTION(PHP_MAXMINDDB_READER_EX_NS, - "Invalid data type arguments: %d", - entry_data_list->entry_data.type); + zend_throw_exception_ex(maxminddb_exception_ce, + 0 TSRMLS_CC, + "Invalid data type arguments: %d", + entry_data_list->entry_data.type); return NULL; } return entry_data_list; @@ -459,30 +436,26 @@ handle_map(const MMDB_entry_data_list_s *entry_data_list, array_init(z_value); const uint32_t map_size = entry_data_list->entry_data.data_size; - uint i; + uint32_t i; for (i = 0; i < map_size && entry_data_list; i++) { entry_data_list = entry_data_list->next; char *key = estrndup((char *)entry_data_list->entry_data.utf8_string, entry_data_list->entry_data.data_size); if (NULL == key) { - THROW_EXCEPTION(PHP_MAXMINDDB_READER_EX_NS, - "Invalid data type arguments"); + zend_throw_exception_ex(maxminddb_exception_ce, + 0 TSRMLS_CC, + "Invalid data type arguments"); return NULL; } entry_data_list = entry_data_list->next; -#ifdef ZEND_ENGINE_3 - zval _new_value; - zval *new_value = &_new_value; - ZVAL_NULL(new_value); -#else - zval *new_value; - ALLOC_INIT_ZVAL(new_value); -#endif + zval new_value; entry_data_list = - handle_entry_data_list(entry_data_list, new_value TSRMLS_CC); - add_assoc_zval(z_value, key, new_value); + handle_entry_data_list(entry_data_list, &new_value TSRMLS_CC); + if (entry_data_list != NULL) { + add_assoc_zval(z_value, key, &new_value); + } efree(key); } return entry_data_list; @@ -495,20 +468,15 @@ handle_array(const MMDB_entry_data_list_s *entry_data_list, array_init(z_value); - uint i; + uint32_t i; for (i = 0; i < size && entry_data_list; i++) { entry_data_list = entry_data_list->next; -#ifdef ZEND_ENGINE_3 - zval _new_value; - zval *new_value = &_new_value; - ZVAL_NULL(new_value); -#else - zval *new_value; - ALLOC_INIT_ZVAL(new_value); -#endif + zval new_value; entry_data_list = - handle_entry_data_list(entry_data_list, new_value TSRMLS_CC); - add_next_index_zval(z_value, new_value); + handle_entry_data_list(entry_data_list, &new_value TSRMLS_CC); + if (entry_data_list != NULL) { + add_next_index_zval(z_value, &new_value); + } } return entry_data_list; } @@ -535,7 +503,7 @@ static void handle_uint128(const MMDB_entry_data_list_s *entry_data_list, spprintf(&num_str, 0, "0x%016" PRIX64 "%016" PRIX64, high, low); CHECK_ALLOCATED(num_str); - _ZVAL_STRING(z_value, num_str); + ZVAL_STRING(z_value, num_str); efree(num_str); } @@ -556,7 +524,7 @@ static void handle_uint32(const MMDB_entry_data_list_s *entry_data_list, spprintf(&int_str, 0, "%" PRIu32, val); CHECK_ALLOCATED(int_str); - _ZVAL_STRING(z_value, int_str); + ZVAL_STRING(z_value, int_str); efree(int_str); #endif } @@ -578,29 +546,11 @@ static void handle_uint64(const MMDB_entry_data_list_s *entry_data_list, spprintf(&int_str, 0, "%" PRIu64, val); CHECK_ALLOCATED(int_str); - _ZVAL_STRING(z_value, int_str); + ZVAL_STRING(z_value, int_str); efree(int_str); #endif } -static zend_class_entry *lookup_class(const char *name TSRMLS_DC) { -#ifdef ZEND_ENGINE_3 - zend_string *n = zend_string_init(name, strlen(name), 0); - zend_class_entry *ce = zend_lookup_class(n); - zend_string_release(n); - if (NULL == ce) { - zend_error(E_ERROR, "Class %s not found", name); - } - return ce; -#else - zend_class_entry **ce; - if (FAILURE == zend_lookup_class(name, strlen(name), &ce TSRMLS_CC)) { - zend_error(E_ERROR, "Class %s not found", name); - } - return *ce; -#endif -} - static void maxminddb_free_storage(free_obj_t *object TSRMLS_DC) { maxminddb_obj *obj = php_maxminddb_fetch_object((zend_object *)object TSRMLS_CC); @@ -610,12 +560,8 @@ static void maxminddb_free_storage(free_obj_t *object TSRMLS_DC) { } zend_object_std_dtor(&obj->std TSRMLS_CC); -#ifndef ZEND_ENGINE_3 - efree(object); -#endif } -#ifdef ZEND_ENGINE_3 static zend_object *maxminddb_create_handler(zend_class_entry *type TSRMLS_DC) { maxminddb_obj *obj = (maxminddb_obj *)ecalloc(1, sizeof(maxminddb_obj)); zend_object_std_init(&obj->std, type TSRMLS_CC); @@ -625,49 +571,210 @@ static zend_object *maxminddb_create_handler(zend_class_entry *type TSRMLS_DC) { return &obj->std; } -#else -static zend_object_value -maxminddb_create_handler(zend_class_entry *type TSRMLS_DC) { - zend_object_value retval; - maxminddb_obj *obj = (maxminddb_obj *)ecalloc(1, sizeof(maxminddb_obj)); - zend_object_std_init(&obj->std, type TSRMLS_CC); - object_properties_init(&(obj->std), type); +/* clang-format off */ +static zend_function_entry maxminddb_methods[] = { + PHP_ME(MaxMind_Db_Reader, __construct, arginfo_maxminddbreader_construct, + ZEND_ACC_PUBLIC | ZEND_ACC_CTOR) + PHP_ME(MaxMind_Db_Reader, close, arginfo_maxminddbreader_void, ZEND_ACC_PUBLIC) + PHP_ME(MaxMind_Db_Reader, get, arginfo_maxminddbreader_get, ZEND_ACC_PUBLIC) + PHP_ME(MaxMind_Db_Reader, getWithPrefixLen, arginfo_maxminddbreader_getWithPrefixLen, ZEND_ACC_PUBLIC) + PHP_ME(MaxMind_Db_Reader, metadata, arginfo_maxminddbreader_void, ZEND_ACC_PUBLIC) + { NULL, NULL, NULL } +}; +/* clang-format on */ - retval.handle = zend_objects_store_put( - obj, NULL, maxminddb_free_storage, NULL TSRMLS_CC); - retval.handlers = &maxminddb_obj_handlers; +ZEND_BEGIN_ARG_INFO_EX(arginfo_metadata_construct, 0, 0, 1) +ZEND_ARG_TYPE_INFO(0, metadata, IS_ARRAY, 0) +ZEND_END_ARG_INFO() - return retval; +PHP_METHOD(MaxMind_Db_Reader_Metadata, __construct) { + zval *object = NULL; + zval *metadata_array = NULL; + zend_long node_count = 0; + zend_long record_size = 0; + + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, + getThis(), + "Oa", + &object, + metadata_ce, + &metadata_array) == FAILURE) { + return; + } + + zval *tmp = NULL; + if ((tmp = zend_hash_str_find(HASH_OF(metadata_array), + "binary_format_major_version", + sizeof("binary_format_major_version") - 1))) { + zend_update_property(metadata_ce, + PROP_OBJ(object), + "binaryFormatMajorVersion", + sizeof("binaryFormatMajorVersion") - 1, + tmp); + } + + if ((tmp = zend_hash_str_find(HASH_OF(metadata_array), + "binary_format_minor_version", + sizeof("binary_format_minor_version") - 1))) { + zend_update_property(metadata_ce, + PROP_OBJ(object), + "binaryFormatMinorVersion", + sizeof("binaryFormatMinorVersion") - 1, + tmp); + } + + if ((tmp = zend_hash_str_find(HASH_OF(metadata_array), + "build_epoch", + sizeof("build_epoch") - 1))) { + zend_update_property(metadata_ce, + PROP_OBJ(object), + "buildEpoch", + sizeof("buildEpoch") - 1, + tmp); + } + + if ((tmp = zend_hash_str_find(HASH_OF(metadata_array), + "database_type", + sizeof("database_type") - 1))) { + zend_update_property(metadata_ce, + PROP_OBJ(object), + "databaseType", + sizeof("databaseType") - 1, + tmp); + } + + if ((tmp = zend_hash_str_find(HASH_OF(metadata_array), + "description", + sizeof("description") - 1))) { + zend_update_property(metadata_ce, + PROP_OBJ(object), + "description", + sizeof("description") - 1, + tmp); + } + + if ((tmp = zend_hash_str_find(HASH_OF(metadata_array), + "ip_version", + sizeof("ip_version") - 1))) { + zend_update_property(metadata_ce, + PROP_OBJ(object), + "ipVersion", + sizeof("ipVersion") - 1, + tmp); + } + + if ((tmp = zend_hash_str_find( + HASH_OF(metadata_array), "languages", sizeof("languages") - 1))) { + zend_update_property(metadata_ce, + PROP_OBJ(object), + "languages", + sizeof("languages") - 1, + tmp); + } + + if ((tmp = zend_hash_str_find(HASH_OF(metadata_array), + "record_size", + sizeof("record_size") - 1))) { + zend_update_property(metadata_ce, + PROP_OBJ(object), + "recordSize", + sizeof("recordSize") - 1, + tmp); + if (Z_TYPE_P(tmp) == IS_LONG) { + record_size = Z_LVAL_P(tmp); + } + } + + if (record_size != 0) { + zend_update_property_long(metadata_ce, + PROP_OBJ(object), + "nodeByteSize", + sizeof("nodeByteSize") - 1, + record_size / 4); + } + + if ((tmp = zend_hash_str_find(HASH_OF(metadata_array), + "node_count", + sizeof("node_count") - 1))) { + zend_update_property(metadata_ce, + PROP_OBJ(object), + "nodeCount", + sizeof("nodeCount") - 1, + tmp); + if (Z_TYPE_P(tmp) == IS_LONG) { + node_count = Z_LVAL_P(tmp); + } + } + + if (record_size != 0) { + zend_update_property_long(metadata_ce, + PROP_OBJ(object), + "searchTreeSize", + sizeof("searchTreeSize") - 1, + record_size * node_count / 4); + } } -#endif // clang-format off -static zend_function_entry maxminddb_methods[] = { - PHP_ME(MaxMind_Db_Reader, __construct, arginfo_maxmindbreader_construct, - ZEND_ACC_PUBLIC | ZEND_ACC_CTOR) - PHP_ME(MaxMind_Db_Reader, close, arginfo_maxmindbreader_void, ZEND_ACC_PUBLIC) - PHP_ME(MaxMind_Db_Reader, get, arginfo_maxmindbreader_get, ZEND_ACC_PUBLIC) - PHP_ME(MaxMind_Db_Reader, getWithPrefixLen, arginfo_maxmindbreader_get, ZEND_ACC_PUBLIC) - PHP_ME(MaxMind_Db_Reader, metadata, arginfo_maxmindbreader_void, ZEND_ACC_PUBLIC) - { NULL, NULL, NULL } +static zend_function_entry metadata_methods[] = { + PHP_ME(MaxMind_Db_Reader_Metadata, __construct, arginfo_metadata_construct, ZEND_ACC_PUBLIC | ZEND_ACC_CTOR) + {NULL, NULL, NULL} }; // clang-format on PHP_MINIT_FUNCTION(maxminddb) { zend_class_entry ce; + INIT_CLASS_ENTRY(ce, PHP_MAXMINDDB_READER_EX_NS, NULL); + maxminddb_exception_ce = + zend_register_internal_class_ex(&ce, zend_ce_exception); + INIT_CLASS_ENTRY(ce, PHP_MAXMINDDB_READER_NS, maxminddb_methods); maxminddb_ce = zend_register_internal_class(&ce TSRMLS_CC); maxminddb_ce->create_object = maxminddb_create_handler; + + INIT_CLASS_ENTRY(ce, PHP_MAXMINDDB_METADATA_NS, metadata_methods); + metadata_ce = zend_register_internal_class(&ce TSRMLS_CC); + zend_declare_property_null(metadata_ce, + "binaryFormatMajorVersion", + sizeof("binaryFormatMajorVersion") - 1, + ZEND_ACC_PUBLIC); + zend_declare_property_null(metadata_ce, + "binaryFormatMinorVersion", + sizeof("binaryFormatMinorVersion") - 1, + ZEND_ACC_PUBLIC); + zend_declare_property_null( + metadata_ce, "buildEpoch", sizeof("buildEpoch") - 1, ZEND_ACC_PUBLIC); + zend_declare_property_null(metadata_ce, + "databaseType", + sizeof("databaseType") - 1, + ZEND_ACC_PUBLIC); + zend_declare_property_null( + metadata_ce, "description", sizeof("description") - 1, ZEND_ACC_PUBLIC); + zend_declare_property_null( + metadata_ce, "ipVersion", sizeof("ipVersion") - 1, ZEND_ACC_PUBLIC); + zend_declare_property_null( + metadata_ce, "languages", sizeof("languages") - 1, ZEND_ACC_PUBLIC); + zend_declare_property_null(metadata_ce, + "nodeByteSize", + sizeof("nodeByteSize") - 1, + ZEND_ACC_PUBLIC); + zend_declare_property_null( + metadata_ce, "nodeCount", sizeof("nodeCount") - 1, ZEND_ACC_PUBLIC); + zend_declare_property_null( + metadata_ce, "recordSize", sizeof("recordSize") - 1, ZEND_ACC_PUBLIC); + zend_declare_property_null(metadata_ce, + "searchTreeSize", + sizeof("searchTreeSize") - 1, + ZEND_ACC_PUBLIC); + memcpy(&maxminddb_obj_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); maxminddb_obj_handlers.clone_obj = NULL; -#ifdef ZEND_ENGINE_3 maxminddb_obj_handlers.offset = XtOffsetOf(maxminddb_obj, std); maxminddb_obj_handlers.free_obj = maxminddb_free_storage; -#endif zend_declare_class_constant_string(maxminddb_ce, "MMDB_LIB_VERSION", sizeof("MMDB_LIB_VERSION") - 1, diff --git a/vendor/maxmind-db/reader/src/MaxMind/Db/Reader.php b/vendor/maxmind-db/reader/src/MaxMind/Db/Reader.php index 3d5a8291d..4dfaef442 100644 --- a/vendor/maxmind-db/reader/src/MaxMind/Db/Reader.php +++ b/vendor/maxmind-db/reader/src/MaxMind/Db/Reader.php @@ -1,7 +1,10 @@ fileHandle = @fopen($database, 'rb'); - if ($this->fileHandle === false) { - throw new InvalidArgumentException( - "Error opening \"$database\"." - ); - } - $this->fileSize = @filesize($database); - if ($this->fileSize === false) { + $this->fileHandle = $fileHandle; + + $fileSize = @filesize($database); + if ($fileSize === false) { throw new UnexpectedValueException( "Error determining the size of \"$database\"." ); } + $this->fileSize = $fileSize; $start = $this->findMetadataStart($database); $metadataDecoder = new Decoder($this->fileHandle, $start); - list($metadataArray) = $metadataDecoder->decode($start); + [$metadataArray] = $metadataDecoder->decode($start); $this->metadata = new Metadata($metadataArray); $this->decoder = new Decoder( $this->fileHandle, @@ -91,14 +119,14 @@ class Reader * * @return mixed the record for the IP address */ - public function get($ipAddress) + public function get(string $ipAddress) { if (\func_num_args() !== 1) { - throw new InvalidArgumentException( - 'Method takes exactly one argument.' + throw new ArgumentCountError( + sprintf('%s() expects exactly 1 parameter, %d given', __METHOD__, \func_num_args()) ); } - list($record) = $this->getWithPrefixLen($ipAddress); + [$record] = $this->getWithPrefixLen($ipAddress); return $record; } @@ -118,11 +146,11 @@ class Reader * @return array an array where the first element is the record and the * second the network prefix length for the record */ - public function getWithPrefixLen($ipAddress) + public function getWithPrefixLen(string $ipAddress): array { if (\func_num_args() !== 1) { - throw new InvalidArgumentException( - 'Method takes exactly one argument.' + throw new ArgumentCountError( + sprintf('%s() expects exactly 1 parameter, %d given', __METHOD__, \func_num_args()) ); } @@ -132,13 +160,7 @@ class Reader ); } - if (!filter_var($ipAddress, FILTER_VALIDATE_IP)) { - throw new InvalidArgumentException( - "The value \"$ipAddress\" is not a valid IP address." - ); - } - - list($pointer, $prefixLen) = $this->findAddressInTree($ipAddress); + [$pointer, $prefixLen] = $this->findAddressInTree($ipAddress); if ($pointer === 0) { return [null, $prefixLen]; } @@ -146,9 +168,16 @@ class Reader return [$this->resolveDataPointer($pointer), $prefixLen]; } - private function findAddressInTree($ipAddress) + private function findAddressInTree(string $ipAddress): array { - $rawAddress = unpack('C*', inet_pton($ipAddress)); + $packedAddr = @inet_pton($ipAddress); + if ($packedAddr === false) { + throw new InvalidArgumentException( + "The value \"$ipAddress\" is not a valid IP address." + ); + } + + $rawAddress = unpack('C*', $packedAddr); $bitCount = \count($rawAddress) * 8; @@ -182,14 +211,18 @@ class Reader if ($node === $nodeCount) { // Record is empty return [0, $i]; - } elseif ($node > $nodeCount) { + } + if ($node > $nodeCount) { // Record is a data pointer return [$node, $i]; } - throw new InvalidDatabaseException('Something bad happened'); + + throw new InvalidDatabaseException( + 'Invalid or corrupt database. Maximum search depth reached without finding a leaf node' + ); } - private function ipV4StartNode() + private function ipV4StartNode(): int { // If we have an IPv4 database, the start node is the first node if ($this->metadata->ipVersion === 4) { @@ -205,16 +238,17 @@ class Reader return $node; } - private function readNode($nodeNumber, $index) + private function readNode(int $nodeNumber, int $index): int { $baseOffset = $nodeNumber * $this->metadata->nodeByteSize; switch ($this->metadata->recordSize) { case 24: $bytes = Util::read($this->fileHandle, $baseOffset + $index * 3, 3); - list(, $node) = unpack('N', "\x00" . $bytes); + [, $node] = unpack('N', "\x00" . $bytes); return $node; + case 28: $bytes = Util::read($this->fileHandle, $baseOffset + 3 * $index, 4); if ($index === 0) { @@ -222,14 +256,16 @@ class Reader } else { $middle = 0x0F & \ord($bytes[0]); } - list(, $node) = unpack('N', \chr($middle) . substr($bytes, $index, 3)); + [, $node] = unpack('N', \chr($middle) . substr($bytes, $index, 3)); return $node; + case 32: $bytes = Util::read($this->fileHandle, $baseOffset + $index * 4, 4); - list(, $node) = unpack('N', $bytes); + [, $node] = unpack('N', $bytes); return $node; + default: throw new InvalidDatabaseException( 'Unknown record size: ' @@ -238,7 +274,10 @@ class Reader } } - private function resolveDataPointer($pointer) + /** + * @return mixed + */ + private function resolveDataPointer(int $pointer) { $resolved = $pointer - $this->metadata->nodeCount + $this->metadata->searchTreeSize; @@ -248,7 +287,7 @@ class Reader ); } - list($data) = $this->decoder->decode($resolved); + [$data] = $this->decoder->decode($resolved); return $data; } @@ -258,7 +297,7 @@ class Reader * are much faster algorithms (e.g., Boyer-Moore) for this if speed is ever * an issue, but I suspect it won't be. */ - private function findMetadataStart($filename) + private function findMetadataStart(string $filename): int { $handle = $this->fileHandle; $fstat = fstat($handle); @@ -278,6 +317,7 @@ class Reader return $offset + $markerLength; } } + throw new InvalidDatabaseException( "Error opening database file ($filename). " . 'Is this a valid MaxMind DB file?' @@ -290,11 +330,11 @@ class Reader * * @return Metadata object for the database */ - public function metadata() + public function metadata(): Metadata { if (\func_num_args()) { - throw new InvalidArgumentException( - 'Method takes no arguments.' + throw new ArgumentCountError( + sprintf('%s() expects exactly 0 parameters, %d given', __METHOD__, \func_num_args()) ); } @@ -306,7 +346,7 @@ class Reader ); } - return $this->metadata; + return clone $this->metadata; } /** @@ -315,8 +355,14 @@ class Reader * @throws Exception * if an I/O error occurs */ - public function close() + public function close(): void { + if (\func_num_args()) { + throw new ArgumentCountError( + sprintf('%s() expects exactly 0 parameters, %d given', __METHOD__, \func_num_args()) + ); + } + if (!\is_resource($this->fileHandle)) { throw new BadMethodCallException( 'Attempt to close a closed MaxMind DB.' diff --git a/vendor/maxmind-db/reader/src/MaxMind/Db/Reader/Decoder.php b/vendor/maxmind-db/reader/src/MaxMind/Db/Reader/Decoder.php index 4b0045641..babaed878 100644 --- a/vendor/maxmind-db/reader/src/MaxMind/Db/Reader/Decoder.php +++ b/vendor/maxmind-db/reader/src/MaxMind/Db/Reader/Decoder.php @@ -7,13 +7,6 @@ namespace MaxMind\Db\Reader; // @codingStandardsIgnoreLine use RuntimeException; -/* - * @ignore - * - * We subtract 1 from the log to protect against precision loss. - */ -\define(__NAMESPACE__ . '\_MM_MAX_INT_BYTES', (int) ((log(\PHP_INT_MAX, 2) - 1) / 8)); - class Decoder { /** @@ -316,11 +309,11 @@ class Decoder $integer = 0; - // PHP integers are signed. _MM_MAX_INT_BYTES is the number of + // PHP integers are signed. PHP_INT_SIZE - 1 is the number of // complete bytes that can be converted to an integer. However, // we can convert another byte if the leading bit is zero. - $useRealInts = $byteLength <= _MM_MAX_INT_BYTES - || ($byteLength === _MM_MAX_INT_BYTES + 1 && (\ord($bytes[0]) & 0x80) === 0); + $useRealInts = $byteLength <= \PHP_INT_SIZE - 1 + || ($byteLength === \PHP_INT_SIZE && (\ord($bytes[0]) & 0x80) === 0); for ($i = 0; $i < $byteLength; ++$i) { $part = \ord($bytes[$i]); @@ -344,7 +337,7 @@ class Decoder private function sizeFromCtrlByte(int $ctrlByte, int $offset): array { - $size = $ctrlByte & 0x1f; + $size = $ctrlByte & 0x1F; if ($size < 29) { return [$size, $offset]; diff --git a/vendor/maxmind-db/reader/src/MaxMind/Db/Reader/InvalidDatabaseException.php b/vendor/maxmind-db/reader/src/MaxMind/Db/Reader/InvalidDatabaseException.php index 478a22c55..532310703 100644 --- a/vendor/maxmind-db/reader/src/MaxMind/Db/Reader/InvalidDatabaseException.php +++ b/vendor/maxmind-db/reader/src/MaxMind/Db/Reader/InvalidDatabaseException.php @@ -1,5 +1,7 @@ binaryFormatMajorVersion = $metadata['binary_format_major_version']; $this->binaryFormatMinorVersion = @@ -80,9 +109,4 @@ class Metadata $this->nodeByteSize = $this->recordSize / 4; $this->searchTreeSize = $this->nodeCount * $this->nodeByteSize; } - - public function __get($var) - { - return $this->$var; - } } diff --git a/vendor/maxmind-db/reader/src/MaxMind/Db/Reader/Util.php b/vendor/maxmind-db/reader/src/MaxMind/Db/Reader/Util.php index 87ebbf133..89db715e3 100644 --- a/vendor/maxmind-db/reader/src/MaxMind/Db/Reader/Util.php +++ b/vendor/maxmind-db/reader/src/MaxMind/Db/Reader/Util.php @@ -1,10 +1,15 @@ Client ID and Secret from there. @@ -162,7 +168,7 @@ You can start off by trying out [creating and capturing an order](/samples/Captu To try out different samples for both create and authorize intent check [this link](/samples) -Note: Update the `PayPalClient.php` with your sandbox client credentials or pass your client credentials as environment variable whie executing the samples. +Note: Update the `PayPalClient.php` with your sandbox client credentials or pass your client credentials as environment variable while executing the samples. ## License diff --git a/vendor/paypal/paypal-checkout-sdk/composer.json b/vendor/paypal/paypal-checkout-sdk/composer.json index 0676fb4c9..fa46c5963 100644 --- a/vendor/paypal/paypal-checkout-sdk/composer.json +++ b/vendor/paypal/paypal-checkout-sdk/composer.json @@ -6,7 +6,7 @@ "license": "https://github.com/paypal/Checkout-PHP-SDK/blob/master/LICENSE", "homepage": "http://github.com/paypal/Checkout-PHP-SDK/", "require": { - "paypal/paypalhttp": "1.0.0" + "paypal/paypalhttp": "1.0.1" }, "authors": [ { diff --git a/vendor/paypal/paypal-checkout-sdk/composer.phar b/vendor/paypal/paypal-checkout-sdk/composer.phar deleted file mode 100644 index 801b9a95b..000000000 Binary files a/vendor/paypal/paypal-checkout-sdk/composer.phar and /dev/null differ diff --git a/vendor/paypal/paypal-checkout-sdk/lib/PayPalCheckoutSdk/Core/FPTIInstrumentationInjector.php b/vendor/paypal/paypal-checkout-sdk/lib/PayPalCheckoutSdk/Core/FPTIInstrumentationInjector.php index 898a7505f..9cd8836e0 100644 --- a/vendor/paypal/paypal-checkout-sdk/lib/PayPalCheckoutSdk/Core/FPTIInstrumentationInjector.php +++ b/vendor/paypal/paypal-checkout-sdk/lib/PayPalCheckoutSdk/Core/FPTIInstrumentationInjector.php @@ -9,7 +9,7 @@ class FPTIInstrumentationInjector implements Injector public function inject($request) { $request->headers["sdk_name"] = "Checkout SDK"; - $request->headers["sdk_version"] = "1.0.1"; + $request->headers["sdk_version"] = "1.0.2"; $request->headers["sdk_tech_stack"] = "PHP " . PHP_VERSION; $request->headers["api_integration_type"] = "PAYPALSDK"; } diff --git a/vendor/paypal/paypal-checkout-sdk/lib/PayPalCheckoutSdk/Core/Version.php b/vendor/paypal/paypal-checkout-sdk/lib/PayPalCheckoutSdk/Core/Version.php index e27286842..e58f0d097 100644 --- a/vendor/paypal/paypal-checkout-sdk/lib/PayPalCheckoutSdk/Core/Version.php +++ b/vendor/paypal/paypal-checkout-sdk/lib/PayPalCheckoutSdk/Core/Version.php @@ -4,5 +4,5 @@ namespace PayPalCheckoutSdk\Core; class Version { - const VERSION = "1.0.1"; + const VERSION = "1.0.2"; } diff --git a/vendor/paypal/paypalhttp/CHANGELOG.md b/vendor/paypal/paypalhttp/CHANGELOG.md index f55b90762..6a099d21f 100644 --- a/vendor/paypal/paypalhttp/CHANGELOG.md +++ b/vendor/paypal/paypalhttp/CHANGELOG.md @@ -1,2 +1,5 @@ +## 1.0.1 +* Fix Case Sensitivity of Content Type for deserialization process + ## 1.0.0 - First release diff --git a/vendor/paypal/paypalhttp/LICENSE b/vendor/paypal/paypalhttp/LICENSE index c689d7426..5ee64d67a 100644 --- a/vendor/paypal/paypalhttp/LICENSE +++ b/vendor/paypal/paypalhttp/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2009-2016 PayPal, Inc. +Copyright (c) 2009-2021 PayPal, Inc. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation diff --git a/vendor/paypal/paypalhttp/lib/PayPalHttp/Encoder.php b/vendor/paypal/paypalhttp/lib/PayPalHttp/Encoder.php index b7158a78f..42c87f98e 100644 --- a/vendor/paypal/paypalhttp/lib/PayPalHttp/Encoder.php +++ b/vendor/paypal/paypalhttp/lib/PayPalHttp/Encoder.php @@ -70,6 +70,7 @@ class Encoder } $contentType = $headers['content-type']; + $contentType = strtolower($contentType); /** @var Serializer $serializer */ $serializer = $this->serializer($contentType); diff --git a/vendor/paypal/paypalhttp/lib/PayPalHttp/HttpClient.php b/vendor/paypal/paypalhttp/lib/PayPalHttp/HttpClient.php index dbbdb7902..82f717e35 100644 --- a/vendor/paypal/paypalhttp/lib/PayPalHttp/HttpClient.php +++ b/vendor/paypal/paypalhttp/lib/PayPalHttp/HttpClient.php @@ -28,7 +28,7 @@ class HttpClient /** * HttpClient constructor. Pass the environment you wish to make calls to. * - * @param $environment Environment + * @param Environment $environment * @see Environment */ function __construct(Environment $environment) @@ -52,8 +52,11 @@ class HttpClient /** * The method that takes an HTTP request, serializes the request, makes a call to given environment, and deserialize response * - * @param $httpRequest HttpRequest + * @param HttpRequest $httpRequest * @return HttpResponse + * + * @throws HttpException + * @throws IOException */ public function execute(HttpRequest $httpRequest) { @@ -110,7 +113,11 @@ class HttpClient * @return array */ public function prepareHeaders($headers){ - return array_change_key_case($headers); + $preparedHeaders = array_change_key_case($headers); + if (array_key_exists("content-type", $preparedHeaders)) { + $preparedHeaders["content-type"] = strtolower($preparedHeaders["content-type"]); + } + return $preparedHeaders; } /** diff --git a/vendor/paypal/paypalhttp/lib/PayPalHttp/HttpException.php b/vendor/paypal/paypalhttp/lib/PayPalHttp/HttpException.php index 5f4d2dbc6..47ec5635f 100644 --- a/vendor/paypal/paypalhttp/lib/PayPalHttp/HttpException.php +++ b/vendor/paypal/paypalhttp/lib/PayPalHttp/HttpException.php @@ -5,14 +5,19 @@ namespace PayPalHttp; class HttpException extends IOException { /** - * @var statusCode + * @var int */ public $statusCode; + /** + * @var array + */ public $headers; /** - * @param string $response + * @param string $message + * @param int $statusCode + * @param array $headers */ public function __construct($message, $statusCode, $headers) { diff --git a/vendor/paypal/paypalhttp/lib/PayPalHttp/HttpResponse.php b/vendor/paypal/paypalhttp/lib/PayPalHttp/HttpResponse.php index ef8fb351d..3ef56feef 100644 --- a/vendor/paypal/paypalhttp/lib/PayPalHttp/HttpResponse.php +++ b/vendor/paypal/paypalhttp/lib/PayPalHttp/HttpResponse.php @@ -11,12 +11,12 @@ namespace PayPalHttp; class HttpResponse { /** - * @var integer + * @var int */ public $statusCode; /** - * @var array | string + * @var array | string | object */ public $result; diff --git a/vendor/paypal/paypalhttp/lib/PayPalHttp/Injector.php b/vendor/paypal/paypalhttp/lib/PayPalHttp/Injector.php index 3ae23c7b2..649e94b9e 100644 --- a/vendor/paypal/paypalhttp/lib/PayPalHttp/Injector.php +++ b/vendor/paypal/paypalhttp/lib/PayPalHttp/Injector.php @@ -13,7 +13,7 @@ namespace PayPalHttp; interface Injector { /** - * @param $httpRequest HttpRequest + * @param HttpRequest $httpRequest */ public function inject($httpRequest); } diff --git a/vendor/phpmailer/phpmailer/VERSION b/vendor/phpmailer/phpmailer/VERSION index 3d5762e85..73092f345 100644 --- a/vendor/phpmailer/phpmailer/VERSION +++ b/vendor/phpmailer/phpmailer/VERSION @@ -1 +1 @@ -6.5.1 \ No newline at end of file +6.5.3 \ No newline at end of file diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-fr.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-fr.php index b57f0ec66..979e44b51 100644 --- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-fr.php +++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-fr.php @@ -9,24 +9,30 @@ * @see http://unicode.org/udhr/n/notes_fra.html */ -$PHPMAILER_LANG['authenticate'] = 'Erreur SMTP : échec de l\'authentification.'; +$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['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.'; $PHPMAILER_LANG['encoding'] = 'Encodage inconnu : '; -$PHPMAILER_LANG['execute'] = 'Impossible de lancer l\'exécution : '; -$PHPMAILER_LANG['file_access'] = 'Impossible d\'accéder au fichier : '; +$PHPMAILER_LANG['execute'] = 'Impossible de lancer l’exécution : '; +$PHPMAILER_LANG['extension_missing'] = 'Extension manquante : '; +$PHPMAILER_LANG['file_access'] = 'Impossible d’accéder au fichier : '; $PHPMAILER_LANG['file_open'] = 'Ouverture du fichier impossible : '; -$PHPMAILER_LANG['from_failed'] = 'L\'adresse d\'expéditeur suivante a échoué : '; -$PHPMAILER_LANG['instantiate'] = 'Impossible d\'instancier la fonction mail.'; -$PHPMAILER_LANG['invalid_address'] = 'L\'adresse courriel n\'est pas valide : '; -$PHPMAILER_LANG['invalid_hostentry'] = 'L\'entrée hôte n\'est pas valide : '; -$PHPMAILER_LANG['invalid_host'] = 'L\'hôte n\'est pas valide : '; +$PHPMAILER_LANG['from_failed'] = 'L’adresse d’expéditeur suivante a échoué : '; +$PHPMAILER_LANG['instantiate'] = 'Impossible d’instancier la fonction mail.'; +$PHPMAILER_LANG['invalid_address'] = 'Adresse courriel non valide : '; +$PHPMAILER_LANG['invalid_header'] = 'Nom ou valeur de l’en-tête non valide'; +$PHPMAILER_LANG['invalid_hostentry'] = 'Entrée d’hôte non valide : '; +$PHPMAILER_LANG['invalid_host'] = 'Hôte non valide : '; $PHPMAILER_LANG['mailer_not_supported'] = ' client de messagerie non supporté.'; $PHPMAILER_LANG['provide_address'] = 'Vous devez fournir au moins une adresse de destinataire.'; -$PHPMAILER_LANG['recipients_failed'] = 'Erreur SMTP : les destinataires suivants sont en erreur : '; +$PHPMAILER_LANG['recipients_failed'] = 'Erreur SMTP : les destinataires suivants ont échoué : '; $PHPMAILER_LANG['signing'] = 'Erreur de signature : '; -$PHPMAILER_LANG['smtp_connect_failed'] = 'Échec de la connexion SMTP.'; +$PHPMAILER_LANG['smtp_code'] = 'Code SMTP : '; +$PHPMAILER_LANG['smtp_code_ex'] = 'Informations supplémentaires SMTP : '; +$PHPMAILER_LANG['smtp_connect_failed'] = 'La fonction SMTP connect() a échouée.'; +$PHPMAILER_LANG['smtp_detail'] = 'Détails : '; $PHPMAILER_LANG['smtp_error'] = 'Erreur du serveur SMTP : '; -$PHPMAILER_LANG['variable_set'] = 'Impossible d\'initialiser ou de réinitialiser une variable : '; +$PHPMAILER_LANG['variable_set'] = 'Impossible d’initialiser ou de réinitialiser une variable : '; $PHPMAILER_LANG['extension_missing'] = 'Extension manquante : '; diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-pt_br.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-pt_br.php index d8638098c..5239865a6 100644 --- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-pt_br.php +++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-pt_br.php @@ -7,24 +7,32 @@ * @author Lucas Guimarães * @author Phelipe Alves * @author Fabio Beneditto + * @author Geidson Benício Coelho */ $PHPMAILER_LANG['authenticate'] = 'Erro de SMTP: Não foi possível autenticar.'; +$PHPMAILER_LANG['buggy_php'] = 'Sua versão do PHP é afetada por um bug que por resultar em messagens corrompidas. Para corrigir, mude para enviar usando SMTP, desative a opção mail.add_x_header em seu php.ini, mude para MacOS ou Linux, ou atualize seu PHP para versão 7.0.17+ ou 7.1.3+ '; $PHPMAILER_LANG['connect_host'] = 'Erro de SMTP: Não foi possível conectar ao servidor SMTP.'; $PHPMAILER_LANG['data_not_accepted'] = 'Erro de SMTP: Dados rejeitados.'; $PHPMAILER_LANG['empty_message'] = 'Mensagem vazia'; $PHPMAILER_LANG['encoding'] = 'Codificação desconhecida: '; $PHPMAILER_LANG['execute'] = 'Não foi possível executar: '; +$PHPMAILER_LANG['extension_missing'] = 'Extensão não existe: '; $PHPMAILER_LANG['file_access'] = 'Não foi possível acessar o arquivo: '; $PHPMAILER_LANG['file_open'] = 'Erro de Arquivo: Não foi possível abrir o arquivo: '; $PHPMAILER_LANG['from_failed'] = 'Os seguintes remetentes falharam: '; $PHPMAILER_LANG['instantiate'] = 'Não foi possível instanciar a função mail.'; $PHPMAILER_LANG['invalid_address'] = 'Endereço de e-mail inválido: '; +$PHPMAILER_LANG['invalid_header'] = 'Nome ou valor de cabeçalho inválido'; +$PHPMAILER_LANG['invalid_hostentry'] = 'hostentry inválido: '; +$PHPMAILER_LANG['invalid_host'] = 'host inválido: '; $PHPMAILER_LANG['mailer_not_supported'] = ' mailer não é suportado.'; $PHPMAILER_LANG['provide_address'] = 'Você deve informar pelo menos um destinatário.'; $PHPMAILER_LANG['recipients_failed'] = 'Erro de SMTP: Os seguintes destinatários falharam: '; $PHPMAILER_LANG['signing'] = 'Erro de Assinatura: '; $PHPMAILER_LANG['smtp_connect_failed'] = 'SMTP Connect() falhou.'; +$PHPMAILER_LANG['smtp_code'] = 'Código do servidor SMTP: '; $PHPMAILER_LANG['smtp_error'] = 'Erro de servidor SMTP: '; +$PHPMAILER_LANG['smtp_code_ex'] = 'Informações adicionais do servidor SMTP: '; +$PHPMAILER_LANG['smtp_detail'] = 'Detalhes do servidor SMTP: '; $PHPMAILER_LANG['variable_set'] = 'Não foi possível definir ou redefinir a variável: '; -$PHPMAILER_LANG['extension_missing'] = 'Extensão não existe: '; diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-ro.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-ro.php index 292ec1e48..45bef9155 100644 --- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-ro.php +++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-ro.php @@ -3,25 +3,31 @@ /** * Romanian PHPMailer language file: refer to English translation for definitive list * @package PHPMailer - * @author Alex Florea */ $PHPMAILER_LANG['authenticate'] = 'Eroare SMTP: Autentificarea a eșuat.'; +$PHPMAILER_LANG['buggy_php'] = 'Versiunea instalată de PHP este afectată de o problemă care poate duce la coruperea mesajelor Pentru a preveni această problemă, folosiți SMTP, dezactivați opțiunea mail.add_x_header din php.ini, folosiți MacOS/Linux sau actualizați versiunea de PHP la 7.0.17+ sau 7.1.3+.'; $PHPMAILER_LANG['connect_host'] = 'Eroare SMTP: Conectarea la serverul SMTP a eșuat.'; $PHPMAILER_LANG['data_not_accepted'] = 'Eroare SMTP: Datele nu au fost acceptate.'; $PHPMAILER_LANG['empty_message'] = 'Mesajul este gol.'; $PHPMAILER_LANG['encoding'] = 'Encodare necunoscută: '; $PHPMAILER_LANG['execute'] = 'Nu se poate executa următoarea comandă: '; +$PHPMAILER_LANG['extension_missing'] = 'Lipsește extensia: '; $PHPMAILER_LANG['file_access'] = 'Nu se poate accesa următorul fișier: '; $PHPMAILER_LANG['file_open'] = 'Eroare fișier: Nu se poate deschide următorul fișier: '; $PHPMAILER_LANG['from_failed'] = 'Următoarele adrese From au dat eroare: '; $PHPMAILER_LANG['instantiate'] = 'Funcția mail nu a putut fi inițializată.'; $PHPMAILER_LANG['invalid_address'] = 'Adresa de email nu este validă: '; +$PHPMAILER_LANG['invalid_header'] = 'Numele sau valoarea header-ului nu este validă: '; +$PHPMAILER_LANG['invalid_hostentry'] = 'Hostentry invalid: '; +$PHPMAILER_LANG['invalid_host'] = 'Host invalid: '; $PHPMAILER_LANG['mailer_not_supported'] = ' mailer nu este suportat.'; $PHPMAILER_LANG['provide_address'] = 'Trebuie să adăugați cel puțin o adresă de email.'; $PHPMAILER_LANG['recipients_failed'] = 'Eroare SMTP: Următoarele adrese de email au eșuat: '; $PHPMAILER_LANG['signing'] = 'A aparut o problemă la semnarea emailului. '; +$PHPMAILER_LANG['smtp_code'] = 'Cod SMTP: '; +$PHPMAILER_LANG['smtp_code_ex'] = 'Informații SMTP adiționale: '; $PHPMAILER_LANG['smtp_connect_failed'] = 'Conectarea la serverul SMTP a eșuat.'; +$PHPMAILER_LANG['smtp_detail'] = 'Detalii SMTP: '; $PHPMAILER_LANG['smtp_error'] = 'Eroare server SMTP: '; $PHPMAILER_LANG['variable_set'] = 'Nu se poate seta/reseta variabila. '; -$PHPMAILER_LANG['extension_missing'] = 'Lipsește extensia: '; diff --git a/vendor/phpmailer/phpmailer/language/phpmailer.lang-sl.php b/vendor/phpmailer/phpmailer/language/phpmailer.lang-sl.php index c437a8862..3e00c2596 100644 --- a/vendor/phpmailer/phpmailer/language/phpmailer.lang-sl.php +++ b/vendor/phpmailer/phpmailer/language/phpmailer.lang-sl.php @@ -9,23 +9,28 @@ */ $PHPMAILER_LANG['authenticate'] = 'SMTP napaka: Avtentikacija ni uspela.'; +$PHPMAILER_LANG['buggy_php'] = 'Na vašo PHP različico vpliva napaka, ki lahko povzroči poškodovana sporočila. Če želite težavo odpraviti, preklopite na pošiljanje prek SMTP, onemogočite možnost mail.add_x_header v vaši php.ini datoteki, preklopite na MacOS ali Linux, ali nadgradite vašo PHP zaličico na 7.0.17+ ali 7.1.3+.'; $PHPMAILER_LANG['connect_host'] = 'SMTP napaka: Vzpostavljanje povezave s SMTP gostiteljem ni uspelo.'; $PHPMAILER_LANG['data_not_accepted'] = 'SMTP napaka: Strežnik zavrača podatke.'; $PHPMAILER_LANG['empty_message'] = 'E-poštno sporočilo nima vsebine.'; $PHPMAILER_LANG['encoding'] = 'Nepoznan tip kodiranja: '; $PHPMAILER_LANG['execute'] = 'Operacija ni uspela: '; +$PHPMAILER_LANG['extension_missing'] = 'Manjkajoča razširitev: '; $PHPMAILER_LANG['file_access'] = 'Nimam dostopa do datoteke: '; $PHPMAILER_LANG['file_open'] = 'Ne morem odpreti datoteke: '; $PHPMAILER_LANG['from_failed'] = 'Neveljaven e-naslov pošiljatelja: '; $PHPMAILER_LANG['instantiate'] = 'Ne morem inicializirati mail funkcije.'; $PHPMAILER_LANG['invalid_address'] = 'E-poštno sporočilo ni bilo poslano. E-naslov je neveljaven: '; +$PHPMAILER_LANG['invalid_header'] = 'Neveljavno ime ali vrednost glave'; $PHPMAILER_LANG['invalid_hostentry'] = 'Neveljaven vnos gostitelja: '; $PHPMAILER_LANG['invalid_host'] = 'Neveljaven gostitelj: '; $PHPMAILER_LANG['mailer_not_supported'] = ' mailer ni podprt.'; $PHPMAILER_LANG['provide_address'] = 'Prosimo, vnesite vsaj enega naslovnika.'; $PHPMAILER_LANG['recipients_failed'] = 'SMTP napaka: Sledeči naslovniki so neveljavni: '; $PHPMAILER_LANG['signing'] = 'Napaka pri podpisovanju: '; +$PHPMAILER_LANG['smtp_code'] = 'SMTP koda: '; +$PHPMAILER_LANG['smtp_code_ex'] = 'Dodatne informacije o SMTP: '; $PHPMAILER_LANG['smtp_connect_failed'] = 'Ne morem vzpostaviti povezave s SMTP strežnikom.'; +$PHPMAILER_LANG['smtp_detail'] = 'Podrobnosti: '; $PHPMAILER_LANG['smtp_error'] = 'Napaka SMTP strežnika: '; $PHPMAILER_LANG['variable_set'] = 'Ne morem nastaviti oz. ponastaviti spremenljivke: '; -$PHPMAILER_LANG['extension_missing'] = 'Manjkajoča razširitev: '; diff --git a/vendor/phpmailer/phpmailer/src/PHPMailer.php b/vendor/phpmailer/phpmailer/src/PHPMailer.php index 5b6dcfad6..20972c4a4 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.1'; + const VERSION = '6.5.3'; /** * Error severity: message only, continue processing. @@ -1451,7 +1451,12 @@ class PHPMailer $errorcode = 0; if (defined('INTL_IDNA_VARIANT_UTS46')) { //Use the current punycode standard (appeared in PHP 7.2) - $punycode = idn_to_ascii($domain, $errorcode, \INTL_IDNA_VARIANT_UTS46); + $punycode = idn_to_ascii( + $domain, + \IDNA_DEFAULT | \IDNA_USE_STD3_RULES | \IDNA_CHECK_BIDI | + \IDNA_CHECK_CONTEXTJ | \IDNA_NONTRANSITIONAL_TO_ASCII, + \INTL_IDNA_VARIANT_UTS46 + ); } elseif (defined('INTL_IDNA_VARIANT_2003')) { //Fall back to this old, deprecated/removed encoding $punycode = idn_to_ascii($domain, $errorcode, \INTL_IDNA_VARIANT_2003); @@ -1697,7 +1702,10 @@ class PHPMailer //Sendmail docs: http://www.sendmail.org/~ca/email/man/sendmail.html //Qmail docs: http://www.qmail.org/man/man8/qmail-inject.html //Example problem: https://www.drupal.org/node/1057954 - if (empty($this->Sender) && !empty(ini_get('sendmail_from'))) { + + //PHP 5.6 workaround + $sendmail_from_value = ini_get('sendmail_from'); + if (empty($this->Sender) && !empty($sendmail_from_value)) { //PHP config has a sender address we can use $this->Sender = ini_get('sendmail_from'); } @@ -1879,7 +1887,10 @@ class PHPMailer //Qmail docs: http://www.qmail.org/man/man8/qmail-inject.html //Example problem: https://www.drupal.org/node/1057954 //CVE-2016-10033, CVE-2016-10045: Don't pass -f if characters will be escaped. - if (empty($this->Sender) && !empty(ini_get('sendmail_from'))) { + + //PHP 5.6 workaround + $sendmail_from_value = ini_get('sendmail_from'); + if (empty($this->Sender) && !empty($sendmail_from_value)) { //PHP config has a sender address we can use $this->Sender = ini_get('sendmail_from'); } @@ -2196,7 +2207,7 @@ class PHPMailer * @param string $langcode ISO 639-1 2-character language code (e.g. French is "fr") * Optionally, the language code can be enhanced with a 4-character * script annotation and/or a 2-character country annotation. - * @param string $lang_path Path to the language file directory, with trailing separator (slash).D + * @param string $lang_path Path to the language file directory, with trailing separator (slash) * Do not set this from user input! * * @return bool Returns true if the requested language was loaded, false otherwise. diff --git a/vendor/phpmailer/phpmailer/src/POP3.php b/vendor/phpmailer/phpmailer/src/POP3.php index 87d9873f7..ea5f9418c 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.1'; + const VERSION = '6.5.3'; /** * Default POP3 port number. @@ -308,6 +308,7 @@ class POP3 { if (!$this->connected) { $this->setError('Not connected to POP3 server'); + return false; } if (empty($username)) { $username = $this->username; @@ -337,6 +338,15 @@ class POP3 public function disconnect() { $this->sendString('QUIT'); + + // RFC 1939 shows POP3 server sending a +OK response to the QUIT command. + // Try to get it. Ignore any failures here. + try { + $this->getResponse(); + } catch (Exception $e) { + //Do nothing + } + //The QUIT command may cause the daemon to exit, which will kill our connection //So ignore errors here try { @@ -344,6 +354,10 @@ class POP3 } catch (Exception $e) { //Do nothing } + + // Clean up attributes. + $this->connected = false; + $this->pop_conn = false; } /** diff --git a/vendor/phpmailer/phpmailer/src/SMTP.php b/vendor/phpmailer/phpmailer/src/SMTP.php index 0cea1e864..676dba292 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.1'; + const VERSION = '6.5.3'; /** * SMTP line break constant. @@ -392,7 +392,6 @@ class SMTP STREAM_CLIENT_CONNECT, $socket_context ); - restore_error_handler(); } else { //Fall back to fsockopen which should work in more places, but is missing some features $this->edebug( @@ -407,8 +406,8 @@ class SMTP $errstr, $timeout ); - restore_error_handler(); } + restore_error_handler(); //Verify we connected properly if (!is_resource($connection)) { @@ -696,7 +695,7 @@ class SMTP /** * Send an SMTP DATA command. * Issues a data command and sends the msg_data to the server, - * finializing the mail transaction. $msg_data is the message + * finalizing the mail transaction. $msg_data is the message * that is to be send with the headers. Each header needs to be * on a single line followed by a with the message headers * and the message body being separated by an additional . @@ -1170,7 +1169,7 @@ class SMTP if (!$this->server_caps) { $this->setError('No HELO/EHLO was sent'); - return; + return null; } if (!array_key_exists($name, $this->server_caps)) { @@ -1182,7 +1181,7 @@ class SMTP } $this->setError('HELO handshake was used; No information about server extensions available'); - return; + return null; } return $this->server_caps[$name]; diff --git a/vendor/stripe/stripe-php/.gitignore b/vendor/stripe/stripe-php/.gitignore index db88f6676..880465ac1 100644 --- a/vendor/stripe/stripe-php/.gitignore +++ b/vendor/stripe/stripe-php/.gitignore @@ -22,6 +22,7 @@ clover.xml # Ignore PHP CS Fixer local config and cache .php_cs .php_cs.cache +.php-cs-fixer.cache # Ignore PHPStan local config .phpstan.neon @@ -29,3 +30,6 @@ clover.xml # Ignore phpDocumentor's local config and artifacts .phpdoc/* phpdoc.xml + +# Ignore cached PHPUnit results. +.phpunit.result.cache diff --git a/vendor/stripe/stripe-php/.php-cs-fixer.php b/vendor/stripe/stripe-php/.php-cs-fixer.php new file mode 100644 index 000000000..d833758e2 --- /dev/null +++ b/vendor/stripe/stripe-php/.php-cs-fixer.php @@ -0,0 +1,61 @@ +notPath('tests/TestCase.php'); + +$config = new PhpCsFixer\Config(); +$config->setRiskyAllowed(true); +$config->setRules([ + // Rulesets + '@PSR2' => true, + '@PhpCsFixer' => true, + '@PhpCsFixer:risky' => true, + '@PHP56Migration:risky' => true, + '@PHPUnit57Migration:risky' => true, + + // Additional rules + 'fopen_flags' => true, + 'linebreak_after_opening_tag' => true, + // This one is non-deterministic based on what environment you are running it in and what `get_defined_constants` returns. + 'native_constant_invocation' => false, + 'native_function_invocation' => [ + "strict" => false, + ], + + // --- Diffs from @PhpCsFixer / @PhpCsFixer:risky --- + + // This is the same as the default for the @PhpCsFixer ruleset, minus + // the following values: ['include', 'include_once', 'require', + // 'require_once']. We could enable them and remove this line after + // updating codegen for the `init.php` file to be compliant. + 'blank_line_before_statement' => ['statements' => ['break', 'case', 'continue', 'declare', 'default', 'exit', 'goto', 'return', 'switch', 'throw', 'try']], + + // This is just prettier / easier to read. + 'concat_space' => ['spacing' => 'one'], + + // This causes strange ordering with codegen'd classes. We might be + // able to enable this if we update codegen to output class elements + // in the correct order. + 'ordered_class_elements' => false, + + // Keep this disabled to avoid unnecessary diffs in PHPDoc comments of + // codegen'd classes. + 'phpdoc_align' => false, + + // This is a "risky" rule that causes a bug in our codebase. + // Specifically, in `StripeObject.updateAttributes` we construct new + // `StripeObject`s for metadata. We can't use `self` there because it + // needs to be a raw `StripeObject`. + 'self_accessor' => false, + + // Visibility annotations are not supported by php5.6 + 'visibility_required' => false, + + // Apparently "uninitialized" is distinct from "null" in some versions of PHP + // so I am defensively disabling this rule so as to not cause breaking changes + // but we can feel free to remove it in a major version (or maybe in a minor if + // we devote some effort into determining that it is safe) + 'no_null_property_initialization' => false, +]); +$config->setFinder($finder); +return $config; diff --git a/vendor/stripe/stripe-php/.php_cs.dist b/vendor/stripe/stripe-php/.php_cs.dist deleted file mode 100644 index 2ebf9f3d8..000000000 --- a/vendor/stripe/stripe-php/.php_cs.dist +++ /dev/null @@ -1,45 +0,0 @@ -setRiskyAllowed(true) - ->setRules([ - // Rulesets - '@PSR2' => true, - '@PhpCsFixer' => true, - '@PhpCsFixer:risky' => true, - '@PHP56Migration:risky' => true, - '@PHPUnit57Migration:risky' => true, - - // Additional rules - 'fopen_flags' => true, - 'linebreak_after_opening_tag' => true, - 'native_constant_invocation' => true, - 'native_function_invocation' => true, - - // --- Diffs from @PhpCsFixer / @PhpCsFixer:risky --- - - // This is the same as the default for the @PhpCsFixer ruleset, minus - // the following values: ['include', 'include_once', 'require', - // 'require_once']. We could enable them and remove this line after - // updating codegen for the `init.php` file to be compliant. - 'blank_line_before_statement' => ['statements' => ['break', 'case', 'continue', 'declare', 'default', 'exit', 'goto', 'return', 'switch', 'throw', 'try']], - - // This is just prettier / easier to read. - 'concat_space' => ['spacing' => 'one'], - - // This causes strange ordering with codegen'd classes. We might be - // able to enable this if we update codegen to output class elements - // in the correct order. - 'ordered_class_elements' => false, - - // Keep this disabled to avoid unnecessary diffs in PHPDoc comments of - // codegen'd classes. - 'phpdoc_align' => false, - - // This is a "risky" rule that causes a bug in our codebase. - // Specifically, in `StripeObject.updateAttributes` we construct new - // `StripeObject`s for metadata. We can't use `self` there because it - // needs to be a raw `StripeObject`. - 'self_accessor' => false, - ]) -; diff --git a/vendor/stripe/stripe-php/CHANGELOG.md b/vendor/stripe/stripe-php/CHANGELOG.md index ad40399cc..98ec3f01c 100644 --- a/vendor/stripe/stripe-php/CHANGELOG.md +++ b/vendor/stripe/stripe-php/CHANGELOG.md @@ -1,5 +1,55 @@ # Changelog +## 7.105.0 - 2021-12-06 +* [#1213](https://github.com/stripe/stripe-php/pull/1213) PHP 8.1, missing ReturnTypeWillChange annotations + +## 7.104.0 - 2021-12-01 +* [#1211](https://github.com/stripe/stripe-php/pull/1211) PHPStan compatibility with PHP8.x +* [#1209](https://github.com/stripe/stripe-php/pull/1209) PHPUnit compatibility with PHP 8.x + +## 7.103.0 - 2021-11-19 +* [#1206](https://github.com/stripe/stripe-php/pull/1206) API Updates + * Add support for new value `jct` on enum `TaxRate.tax_type` + +## 7.102.0 - 2021-11-17 +* [#1205](https://github.com/stripe/stripe-php/pull/1205) API Updates + * Add support for `automatic_payment_methods` on `PaymentIntent` + +## 7.101.0 - 2021-11-16 +* [#1203](https://github.com/stripe/stripe-php/pull/1203) API Updates + * Add support for new resource `ShippingRate` + * Add support for `shipping_options` and `shipping_rate` on `Checkout.Session` + * Add support for `expire` method on resource `Checkout.Session` + * Add support for `status` on `Checkout.Session` + +## 7.100.0 - 2021-10-11 +* [#1190](https://github.com/stripe/stripe-php/pull/1190) API Updates + * Add support for `klarna` on `PaymentMethod`. + +## 7.99.0 - 2021-10-11 +* [#1188](https://github.com/stripe/stripe-php/pull/1188) API Updates + * Add support for `list_payment_methods` method on resource `Customer` + +## 7.98.0 - 2021-10-07 +* [#1187](https://github.com/stripe/stripe-php/pull/1187) API Updates + * Add support for `phone_number_collection` on `Checkout.Session` + * Add support for new value `customer_id` on enum `Radar.ValueList.item_type` + * Add support for new value `bbpos_wisepos_e` on enum `Terminal.Reader.device_type` + +## 7.97.0 - 2021-09-16 +* [#1181](https://github.com/stripe/stripe-php/pull/1181) API Updates + * Add support for `full_name_aliases` on `Person` + +## 7.96.0 - 2021-09-15 +* [#1178](https://github.com/stripe/stripe-php/pull/1178) API Updates + * Add support for livemode on Reporting.ReportType + * Add support for new value `rst` on enum `TaxRate.tax_type` + +## 7.95.0 - 2021-09-01 +* [#1177](https://github.com/stripe/stripe-php/pull/1177) API Updates + * Add support for `future_requirements` on `Account`, `Capability`, and `Person` + * Add support for `after_expiration`, `consent`, `consent_collection`, `expires_at`, and `recovered_from` on `Checkout.Session` + ## 7.94.0 - 2021-08-19 * [#1173](https://github.com/stripe/stripe-php/pull/1173) API Updates * Add support for new value `fil` on enum `Checkout.Session.locale` diff --git a/vendor/stripe/stripe-php/Makefile b/vendor/stripe/stripe-php/Makefile index 61b6de53e..f9c597580 100644 --- a/vendor/stripe/stripe-php/Makefile +++ b/vendor/stripe/stripe-php/Makefile @@ -1,13 +1,8 @@ export PHPDOCUMENTOR_VERSION := v3.0.0 -export PHPSTAN_VERSION := 0.12.59 vendor: composer.json composer install -vendor/bin/phpstan: vendor - curl -sfL https://github.com/phpstan/phpstan/releases/download/$(PHPSTAN_VERSION)/phpstan.phar -o vendor/bin/phpstan - chmod +x vendor/bin/phpstan - vendor/bin/phpdoc: vendor curl -sfL https://github.com/phpDocumentor/phpDocumentor/releases/download/$(PHPDOCUMENTOR_VERSION)/phpDocumentor.phar -o vendor/bin/phpdoc chmod +x vendor/bin/phpdoc @@ -27,7 +22,7 @@ fmtcheck: vendor phpdoc: vendor/bin/phpdoc vendor/bin/phpdoc -phpstan: vendor/bin/phpstan +phpstan: vendor php -d memory_limit=512M vendor/bin/phpstan analyse lib tests .PHONY: phpstan diff --git a/vendor/stripe/stripe-php/README.md b/vendor/stripe/stripe-php/README.md index 9aed270f1..1d2fe4434 100644 --- a/vendor/stripe/stripe-php/README.md +++ b/vendor/stripe/stripe-php/README.md @@ -4,7 +4,6 @@ [![Latest Stable Version](https://poser.pugx.org/stripe/stripe-php/v/stable.svg)](https://packagist.org/packages/stripe/stripe-php) [![Total Downloads](https://poser.pugx.org/stripe/stripe-php/downloads.svg)](https://packagist.org/packages/stripe/stripe-php) [![License](https://poser.pugx.org/stripe/stripe-php/license.svg)](https://packagist.org/packages/stripe/stripe-php) -[![Code Coverage](https://coveralls.io/repos/stripe/stripe-php/badge.svg?branch=master)](https://coveralls.io/r/stripe/stripe-php?branch=master) The Stripe PHP library provides convenient access to the Stripe API from applications written in the PHP language. It includes a pre-defined set of diff --git a/vendor/stripe/stripe-php/VERSION b/vendor/stripe/stripe-php/VERSION index 277084a67..aa91ae022 100644 --- a/vendor/stripe/stripe-php/VERSION +++ b/vendor/stripe/stripe-php/VERSION @@ -1 +1 @@ -7.94.0 +7.105.0 diff --git a/vendor/stripe/stripe-php/composer.json b/vendor/stripe/stripe-php/composer.json index 17bde01c3..d8d4551dc 100644 --- a/vendor/stripe/stripe-php/composer.json +++ b/vendor/stripe/stripe-php/composer.json @@ -21,11 +21,10 @@ "ext-mbstring": "*" }, "require-dev": { - "phpunit/phpunit": "^5.7", - "php-coveralls/php-coveralls": "^2.1", + "phpunit/phpunit": "^5.7 || ^9.0", "squizlabs/php_codesniffer": "^3.3", - "symfony/process": "~3.4", - "friendsofphp/php-cs-fixer": "2.17.1" + "friendsofphp/php-cs-fixer": "3.2.1", + "phpstan/phpstan": "^1.2" }, "autoload": { "psr-4": { diff --git a/vendor/stripe/stripe-php/init.php b/vendor/stripe/stripe-php/init.php index df7764340..7dda8f163 100644 --- a/vendor/stripe/stripe-php/init.php +++ b/vendor/stripe/stripe-php/init.php @@ -143,6 +143,7 @@ require __DIR__ . '/lib/Reporting/ReportType.php'; require __DIR__ . '/lib/Review.php'; require __DIR__ . '/lib/SetupAttempt.php'; require __DIR__ . '/lib/SetupIntent.php'; +require __DIR__ . '/lib/ShippingRate.php'; require __DIR__ . '/lib/Sigma/ScheduledQueryRun.php'; require __DIR__ . '/lib/SKU.php'; require __DIR__ . '/lib/Source.php'; @@ -215,6 +216,7 @@ require __DIR__ . '/lib/Service/Reporting/ReportTypeService.php'; require __DIR__ . '/lib/Service/ReviewService.php'; require __DIR__ . '/lib/Service/SetupAttemptService.php'; require __DIR__ . '/lib/Service/SetupIntentService.php'; +require __DIR__ . '/lib/Service/ShippingRateService.php'; require __DIR__ . '/lib/Service/Sigma/ScheduledQueryRunService.php'; require __DIR__ . '/lib/Service/SkuService.php'; require __DIR__ . '/lib/Service/SourceService.php'; diff --git a/vendor/stripe/stripe-php/lib/Account.php b/vendor/stripe/stripe-php/lib/Account.php index 68fb7e835..9be2b82ca 100644 --- a/vendor/stripe/stripe-php/lib/Account.php +++ b/vendor/stripe/stripe-php/lib/Account.php @@ -27,6 +27,7 @@ namespace Stripe; * @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\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. * @property bool $payouts_enabled Whether Stripe can send payouts to this account. @@ -263,7 +264,6 @@ class Account extends ApiResource { return self::_updateNestedResource($id, static::PATH_CAPABILITIES, $capabilityId, $params, $opts); } - const PATH_EXTERNAL_ACCOUNTS = '/external_accounts'; /** @@ -338,7 +338,6 @@ class Account extends ApiResource { return self::_updateNestedResource($id, static::PATH_EXTERNAL_ACCOUNTS, $externalAccountId, $params, $opts); } - const PATH_LOGIN_LINKS = '/login_links'; /** @@ -354,7 +353,6 @@ class Account extends ApiResource { return self::_createNestedResource($id, static::PATH_LOGIN_LINKS, $params, $opts); } - const PATH_PERSONS = '/persons'; /** diff --git a/vendor/stripe/stripe-php/lib/ApiOperations/Request.php b/vendor/stripe/stripe-php/lib/ApiOperations/Request.php index 24c374156..a60ca796a 100644 --- a/vendor/stripe/stripe-php/lib/ApiOperations/Request.php +++ b/vendor/stripe/stripe-php/lib/ApiOperations/Request.php @@ -53,8 +53,6 @@ trait Request * @param null|array|string $options * * @throws \Stripe\Exception\ApiErrorException if the request fails - * - * @return array tuple containing (the JSON response, $options) */ protected function _requestStream($method, $url, $readBodyChunk, $params = [], $options = null) { diff --git a/vendor/stripe/stripe-php/lib/ApiRequestor.php b/vendor/stripe/stripe-php/lib/ApiRequestor.php index 587cd46ef..b2fa19237 100644 --- a/vendor/stripe/stripe-php/lib/ApiRequestor.php +++ b/vendor/stripe/stripe-php/lib/ApiRequestor.php @@ -135,8 +135,6 @@ class ApiRequestor * @param null|array $headers * * @throws Exception\ApiErrorException - * - * @return array tuple containing (ApiReponse, API key) */ public function requestStream($method, $url, $readBodyChunkCallable, $params = null, $headers = null) { @@ -461,7 +459,7 @@ class ApiRequestor if (isset($rheaders['request-id']) && \is_string($rheaders['request-id']) - && \strlen($rheaders['request-id']) > 0) { + && '' !== $rheaders['request-id']) { self::$requestTelemetry = new RequestTelemetry( $rheaders['request-id'], Util\Util::currentTimeMillis() - $requestStartMs @@ -501,7 +499,7 @@ class ApiRequestor if (isset($rheaders['request-id']) && \is_string($rheaders['request-id']) - && \strlen($rheaders['request-id']) > 0) { + && '' !== $rheaders['request-id']) { self::$requestTelemetry = new RequestTelemetry( $rheaders['request-id'], Util\Util::currentTimeMillis() - $requestStartMs diff --git a/vendor/stripe/stripe-php/lib/ApiResource.php b/vendor/stripe/stripe-php/lib/ApiResource.php index 521010b3f..25c6b84a0 100644 --- a/vendor/stripe/stripe-php/lib/ApiResource.php +++ b/vendor/stripe/stripe-php/lib/ApiResource.php @@ -82,6 +82,8 @@ abstract class ApiResource extends StripeObject { // Replace dots with slashes for namespaced resources, e.g. if the object's name is // "foo.bar", then its URL will be "/v1/foo/bars". + + /** @phpstan-ignore-next-line */ $base = \str_replace('.', '/', static::OBJECT_NAME); return "/v1/{$base}s"; diff --git a/vendor/stripe/stripe-php/lib/BillingPortal/Session.php b/vendor/stripe/stripe-php/lib/BillingPortal/Session.php index d41335132..5cec9a400 100644 --- a/vendor/stripe/stripe-php/lib/BillingPortal/Session.php +++ b/vendor/stripe/stripe-php/lib/BillingPortal/Session.php @@ -19,8 +19,6 @@ namespace Stripe\BillingPortal; * billing details. * * Learn more in the product - * overview and integration * guide. * diff --git a/vendor/stripe/stripe-php/lib/Capability.php b/vendor/stripe/stripe-php/lib/Capability.php index 3580df60b..f675d719f 100644 --- a/vendor/stripe/stripe-php/lib/Capability.php +++ b/vendor/stripe/stripe-php/lib/Capability.php @@ -14,6 +14,7 @@ namespace Stripe; * @property string $id The identifier for the capability. * @property string $object String representing the object's type. Objects of the same type share the same value. * @property string|\Stripe\Account $account The account for which the capability enables functionality. + * @property \Stripe\StripeObject $future_requirements * @property bool $requested Whether the capability has been requested. * @property null|int $requested_at Time at which the capability was requested. Measured in seconds since the Unix epoch. * @property \Stripe\StripeObject $requirements diff --git a/vendor/stripe/stripe-php/lib/Checkout/Session.php b/vendor/stripe/stripe-php/lib/Checkout/Session.php index e339bb537..9601dd8d4 100644 --- a/vendor/stripe/stripe-php/lib/Checkout/Session.php +++ b/vendor/stripe/stripe-php/lib/Checkout/Session.php @@ -7,8 +7,9 @@ namespace Stripe\Checkout; /** * A Checkout Session represents your customer's session as they pay for one-time * purchases or subscriptions through Checkout. We recommend - * creating a new Session each time your customer attempts to pay. + * href="https://stripe.com/docs/payments/checkout">Checkout or Payment Links. We + * recommend creating a new Session each time your customer attempts to pay. * * Once payment is successful, the Checkout Session will contain a reference to the * Customer, and either the @@ -24,6 +25,7 @@ namespace Stripe\Checkout; * * @property string $id Unique identifier for the object. Used to pass to redirectToCheckout in Stripe.js. * @property string $object String representing the object's type. Objects of the same type share the same value. + * @property null|\Stripe\StripeObject $after_expiration When set, provides configuration for actions to take if this Checkout Session expires. * @property null|bool $allow_promotion_codes Enables user redeemable promotion codes. * @property null|int $amount_subtotal Total of all items before discounts or taxes are applied. * @property null|int $amount_total Total of all items after discounts and taxes are applied. @@ -31,10 +33,13 @@ namespace Stripe\Checkout; * @property null|string $billing_address_collection Describes whether Checkout should collect the customer's billing address. * @property string $cancel_url The URL the customer will be directed to if they decide to cancel payment and return to your website. * @property null|string $client_reference_id A unique string to reference the Checkout Session. This can be a customer ID, a cart ID, or similar, and can be used to reconcile the Session with your internal systems. + * @property null|\Stripe\StripeObject $consent Results of consent_collection for this session. + * @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|\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 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. @@ -44,9 +49,14 @@ namespace Stripe\Checkout; * @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. + * @property \Stripe\StripeObject $phone_number_collection + * @property null|string $recovered_from The ID of the original expired Checkout Session that triggered the recovery flow. * @property null|string|\Stripe\SetupIntent $setup_intent The ID of the SetupIntent for Checkout Sessions in setup mode. * @property null|\Stripe\StripeObject $shipping Shipping information for this Checkout Session. * @property null|\Stripe\StripeObject $shipping_address_collection When set, provides configuration for Checkout to collect a shipping address from a customer. + * @property \Stripe\StripeObject[] $shipping_options The shipping rate options applied to this Session. + * @property null|string|\Stripe\ShippingRate $shipping_rate The ID of the ShippingRate for Checkout Sessions in payment mode. + * @property null|string $status The status of the Checkout Session, one of open, complete, or expired. * @property null|string $submit_type Describes the type of transaction being performed by Checkout in order to customize relevant text on the page, such as the submit button. submit_type can only be specified on Checkout Sessions in payment mode, but not Checkout Sessions in subscription or setup mode. * @property null|string|\Stripe\Subscription $subscription The ID of the subscription for Checkout Sessions in subscription mode. * @property string $success_url The URL the customer will be directed to after the payment or subscription creation is successful. @@ -74,11 +84,32 @@ class Session extends \Stripe\ApiResource const PAYMENT_STATUS_PAID = 'paid'; const PAYMENT_STATUS_UNPAID = 'unpaid'; + const STATUS_COMPLETE = 'complete'; + const STATUS_EXPIRED = 'expired'; + const STATUS_OPEN = 'open'; + const SUBMIT_TYPE_AUTO = 'auto'; const SUBMIT_TYPE_BOOK = 'book'; const SUBMIT_TYPE_DONATE = 'donate'; const SUBMIT_TYPE_PAY = 'pay'; + /** + * @param null|array $params + * @param null|array|string $opts + * + * @throws \Stripe\Exception\ApiErrorException if the request fails + * + * @return \Stripe\Session the expired session + */ + public function expire($params = null, $opts = null) + { + $url = $this->instanceUrl() . '/expire'; + list($response, $opts) = $this->_request('post', $url, $params, $opts); + $this->refreshFrom($response, $opts); + + return $this; + } + const PATH_LINE_ITEMS = '/line_items'; /** diff --git a/vendor/stripe/stripe-php/lib/Collection.php b/vendor/stripe/stripe-php/lib/Collection.php index 899299d3d..294ea9ddf 100644 --- a/vendor/stripe/stripe-php/lib/Collection.php +++ b/vendor/stripe/stripe-php/lib/Collection.php @@ -47,6 +47,7 @@ class Collection extends StripeObject implements \Countable, \IteratorAggregate $this->filters = $filters; } + #[\ReturnTypeWillChange] public function offsetGet($k) { if (\is_string($k)) { @@ -107,6 +108,7 @@ class Collection extends StripeObject implements \Countable, \IteratorAggregate /** * @return int the number of objects in the current page */ + #[\ReturnTypeWillChange] public function count() { return \count($this->data); @@ -116,6 +118,7 @@ class Collection extends StripeObject implements \Countable, \IteratorAggregate * @return \ArrayIterator an iterator that can be used to iterate * across objects in the current page */ + #[\ReturnTypeWillChange] public function getIterator() { return new \ArrayIterator($this->data); diff --git a/vendor/stripe/stripe-php/lib/Customer.php b/vendor/stripe/stripe-php/lib/Customer.php index 6cc983a72..c1b6ad72e 100644 --- a/vendor/stripe/stripe-php/lib/Customer.php +++ b/vendor/stripe/stripe-php/lib/Customer.php @@ -78,6 +78,27 @@ class Customer extends ApiResource $url = $this->instanceUrl() . '/discount'; list($response, $opts) = $this->_request('delete', $url, $params, $opts); $this->refreshFrom(['discount' => null], $opts, true); + + return $this; + } + + /** + * @param null|array $params + * @param null|array|string $opts + * @param mixed $id + * + * @throws \Stripe\Exception\ApiErrorException if the request fails + * + * @return \Stripe\Collection list of PaymentMethods + */ + public static function allPaymentMethods($id, $params = null, $opts = null) + { + $url = static::resourceUrl($id) . '/payment_methods'; + list($response, $opts) = static::_staticRequest('get', $url, $params, $opts); + $obj = \Stripe\Util\Util::convertToStripeObject($response->json, $opts); + $obj->setLastResponse($response); + + return $obj; } const PATH_BALANCE_TRANSACTIONS = '/balance_transactions'; @@ -139,7 +160,6 @@ class Customer extends ApiResource { return self::_updateNestedResource($id, static::PATH_BALANCE_TRANSACTIONS, $balanceTransactionId, $params, $opts); } - const PATH_SOURCES = '/sources'; /** @@ -214,7 +234,6 @@ class Customer extends ApiResource { return self::_updateNestedResource($id, static::PATH_SOURCES, $sourceId, $params, $opts); } - const PATH_TAX_IDS = '/tax_ids'; /** diff --git a/vendor/stripe/stripe-php/lib/PaymentIntent.php b/vendor/stripe/stripe-php/lib/PaymentIntent.php index 7a02f1fef..70d068ec0 100644 --- a/vendor/stripe/stripe-php/lib/PaymentIntent.php +++ b/vendor/stripe/stripe-php/lib/PaymentIntent.php @@ -25,6 +25,7 @@ namespace Stripe; * @property int $amount_received Amount that was collected by this PaymentIntent. * @property null|string|\Stripe\StripeObject $application ID of the Connect application that created the PaymentIntent. * @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. The amount of the application fee collected will be capped at the total payment amount. For more information, see the PaymentIntents use case for connected accounts. + * @property null|\Stripe\StripeObject $automatic_payment_methods Settings to configure compatible payment methods from the Stripe Dashboard * @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. diff --git a/vendor/stripe/stripe-php/lib/PaymentMethod.php b/vendor/stripe/stripe-php/lib/PaymentMethod.php index 36a01d3b3..b4ecd0556 100644 --- a/vendor/stripe/stripe-php/lib/PaymentMethod.php +++ b/vendor/stripe/stripe-php/lib/PaymentMethod.php @@ -36,6 +36,7 @@ namespace Stripe; * @property \Stripe\StripeObject $grabpay * @property \Stripe\StripeObject $ideal * @property \Stripe\StripeObject $interac_present + * @property \Stripe\StripeObject $klarna * @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 \Stripe\StripeObject $oxxo diff --git a/vendor/stripe/stripe-php/lib/Person.php b/vendor/stripe/stripe-php/lib/Person.php index ad2b46f15..a1df01398 100644 --- a/vendor/stripe/stripe-php/lib/Person.php +++ b/vendor/stripe/stripe-php/lib/Person.php @@ -31,6 +31,8 @@ namespace Stripe; * @property null|string $first_name The person's first name. * @property null|string $first_name_kana The Kana variation of the person's first name (Japan only). * @property null|string $first_name_kanji The Kanji variation of the person's first name (Japan only). + * @property string[] $full_name_aliases A list of alternate names or aliases that the person is known by. + * @property null|\Stripe\StripeObject $future_requirements Information about the upcoming new requirements for this person, including what information needs to be collected, and by when. * @property null|string $gender The person's gender (International regulations require either "male" or "female"). * @property bool $id_number_provided Whether the person's id_number was provided. * @property null|string $last_name The person's last name. diff --git a/vendor/stripe/stripe-php/lib/Price.php b/vendor/stripe/stripe-php/lib/Price.php index 8f994d548..878a7a2c4 100644 --- a/vendor/stripe/stripe-php/lib/Price.php +++ b/vendor/stripe/stripe-php/lib/Price.php @@ -30,7 +30,7 @@ namespace Stripe; * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch. * @property string $currency Three-letter ISO currency code, in lowercase. Must be a supported currency. * @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 $lookup_key A lookup key used to retrieve prices dynamically from a static string. + * @property null|string $lookup_key A lookup key used to retrieve prices dynamically from a static string. This may be up to 200 characters. * @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 $nickname A brief description of the price, hidden from customers. * @property string|\Stripe\Product $product The ID of the product this price is associated with. diff --git a/vendor/stripe/stripe-php/lib/Quote.php b/vendor/stripe/stripe-php/lib/Quote.php index 14ed843fb..67fc62723 100644 --- a/vendor/stripe/stripe-php/lib/Quote.php +++ b/vendor/stripe/stripe-php/lib/Quote.php @@ -66,8 +66,6 @@ class Quote extends ApiResource * @param null|array|string $opts * * @throws \Stripe\Exception\ApiErrorException if the request fails - * - * @return \Stripe\File the created file */ public function pdf($readBodyChunkCallable, $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 bcbef74cd..ad374325d 100644 --- a/vendor/stripe/stripe-php/lib/Radar/ValueList.php +++ b/vendor/stripe/stripe-php/lib/Radar/ValueList.php @@ -17,7 +17,7 @@ namespace Stripe\Radar; * @property string $alias The name of the value list for use in rules. * @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, or case_sensitive_string. + * @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 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/Reporting/ReportType.php b/vendor/stripe/stripe-php/lib/Reporting/ReportType.php index 3bb146029..4725656e4 100644 --- a/vendor/stripe/stripe-php/lib/Reporting/ReportType.php +++ b/vendor/stripe/stripe-php/lib/Reporting/ReportType.php @@ -21,6 +21,7 @@ namespace Stripe\Reporting; * @property int $data_available_end Most recent time for which this Report Type is available. Measured in seconds since the Unix epoch. * @property int $data_available_start Earliest time for which this Report Type is available. Measured in seconds since the Unix epoch. * @property null|string[] $default_columns List of column names that are included by default when this Report Type gets run. (If the Report Type doesn't support the columns parameter, this will be null.) + * @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 $name Human-readable name of the Report Type * @property int $updated When this Report Type was latest updated. Measured in seconds since the Unix epoch. * @property int $version Version of the Report Type. Different versions report with the same ID will have the same purpose, but may take different run parameters or have different result schemas. diff --git a/vendor/stripe/stripe-php/lib/Service/ChargeService.php b/vendor/stripe/stripe-php/lib/Service/ChargeService.php index f5321b8ac..f8960edfb 100644 --- a/vendor/stripe/stripe-php/lib/Service/ChargeService.php +++ b/vendor/stripe/stripe-php/lib/Service/ChargeService.php @@ -27,9 +27,10 @@ class ChargeService extends \Stripe\Service\AbstractService * of the two-step payment flow, where first you created a * charge with the capture option set to false. * - * Uncaptured payments expire exactly seven days after they are created. If they - * are not captured by that point in time, they will be marked as refunded and will - * no longer be capturable. + * Uncaptured payments expire a set number of days after they are created (7 by default). If they are not captured + * by that point in time, they will be marked as refunded and will no longer be + * capturable. * * @param string $id * @param null|array $params diff --git a/vendor/stripe/stripe-php/lib/Service/Checkout/SessionService.php b/vendor/stripe/stripe-php/lib/Service/Checkout/SessionService.php index 9da378878..b42ab8a17 100644 --- a/vendor/stripe/stripe-php/lib/Service/Checkout/SessionService.php +++ b/vendor/stripe/stripe-php/lib/Service/Checkout/SessionService.php @@ -55,6 +55,25 @@ class SessionService extends \Stripe\Service\AbstractService return $this->request('post', '/v1/checkout/sessions', $params, $opts); } + /** + * A Session can be expired when it is in one of these statuses: open. + * + * After it expires, a customer can’t complete a Session and customers loading the + * Session see a message saying the Session is expired. + * + * @param string $id + * @param null|array $params + * @param null|array|\Stripe\Util\RequestOptions $opts + * + * @throws \Stripe\Exception\ApiErrorException if the request fails + * + * @return \Stripe\Checkout\Session + */ + public function expire($id, $params = null, $opts = null) + { + return $this->request('post', $this->buildPath('/v1/checkout/sessions/%s/expire', $id), $params, $opts); + } + /** * Retrieves a Session object. * diff --git a/vendor/stripe/stripe-php/lib/Service/CoreServiceFactory.php b/vendor/stripe/stripe-php/lib/Service/CoreServiceFactory.php index 2e0c00dad..540d24d50 100644 --- a/vendor/stripe/stripe-php/lib/Service/CoreServiceFactory.php +++ b/vendor/stripe/stripe-php/lib/Service/CoreServiceFactory.php @@ -48,6 +48,7 @@ namespace Stripe\Service; * @property ReviewService $reviews * @property SetupAttemptService $setupAttempts * @property SetupIntentService $setupIntents + * @property ShippingRateService $shippingRates * @property Sigma\SigmaServiceFactory $sigma * @property SkuService $skus * @property SourceService $sources @@ -109,6 +110,7 @@ class CoreServiceFactory extends \Stripe\Service\AbstractServiceFactory 'reviews' => ReviewService::class, 'setupAttempts' => SetupAttemptService::class, 'setupIntents' => SetupIntentService::class, + 'shippingRates' => ShippingRateService::class, 'sigma' => Sigma\SigmaServiceFactory::class, 'skus' => SkuService::class, 'sources' => SourceService::class, diff --git a/vendor/stripe/stripe-php/lib/Service/CustomerService.php b/vendor/stripe/stripe-php/lib/Service/CustomerService.php index fdc6a5960..50dddec49 100644 --- a/vendor/stripe/stripe-php/lib/Service/CustomerService.php +++ b/vendor/stripe/stripe-php/lib/Service/CustomerService.php @@ -39,6 +39,22 @@ class CustomerService extends \Stripe\Service\AbstractService return $this->requestCollection('get', $this->buildPath('/v1/customers/%s/balance_transactions', $parentId), $params, $opts); } + /** + * Returns a list of PaymentMethods for a given Customer. + * + * @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 + */ + public function allPaymentMethods($id, $params = null, $opts = null) + { + return $this->requestCollection('get', $this->buildPath('/v1/customers/%s/payment_methods', $id), $params, $opts); + } + /** * List sources for a specified customer. * diff --git a/vendor/stripe/stripe-php/lib/Service/PaymentIntentService.php b/vendor/stripe/stripe-php/lib/Service/PaymentIntentService.php index 43aba46d8..912cec14d 100644 --- a/vendor/stripe/stripe-php/lib/Service/PaymentIntentService.php +++ b/vendor/stripe/stripe-php/lib/Service/PaymentIntentService.php @@ -24,7 +24,8 @@ class PaymentIntentService extends \Stripe\Service\AbstractService /** * A PaymentIntent object can be canceled when it is in one of these statuses: * requires_payment_method, requires_capture, - * requires_confirmation, or requires_action. + * requires_confirmation, requires_action, or + * processing. * * Once canceled, no additional charges will be made by the PaymentIntent and any * operations on the PaymentIntent will fail with an error. For PaymentIntents with @@ -48,8 +49,8 @@ class PaymentIntentService extends \Stripe\Service\AbstractService * Capture the funds of an existing uncaptured PaymentIntent when its status is * requires_capture. * - * Uncaptured PaymentIntents will be canceled exactly seven days after they are - * created. + * Uncaptured PaymentIntents will be canceled a set number of days after they are + * created (7 by default). * * Learn more about separate authorization * and capture. diff --git a/vendor/stripe/stripe-php/lib/Service/PaymentMethodService.php b/vendor/stripe/stripe-php/lib/Service/PaymentMethodService.php index 3bdebd971..e7f341a0b 100644 --- a/vendor/stripe/stripe-php/lib/Service/PaymentMethodService.php +++ b/vendor/stripe/stripe-php/lib/Service/PaymentMethodService.php @@ -7,7 +7,9 @@ namespace Stripe\Service; class PaymentMethodService extends \Stripe\Service\AbstractService { /** - * Returns a list of PaymentMethods for a given Customer. + * Returns a list of PaymentMethods. For listing a customer’s payment methods, you + * should use List a Customer’s + * PaymentMethods. * * @param null|array $params * @param null|array|\Stripe\Util\RequestOptions $opts diff --git a/vendor/stripe/stripe-php/lib/Service/ShippingRateService.php b/vendor/stripe/stripe-php/lib/Service/ShippingRateService.php new file mode 100644 index 000000000..d7b55a8b3 --- /dev/null +++ b/vendor/stripe/stripe-php/lib/Service/ShippingRateService.php @@ -0,0 +1,70 @@ +requestCollection('get', '/v1/shipping_rates', $params, $opts); + } + + /** + * Creates a new shipping rate object. + * + * @param null|array $params + * @param null|array|\Stripe\Util\RequestOptions $opts + * + * @throws \Stripe\Exception\ApiErrorException if the request fails + * + * @return \Stripe\ShippingRate + */ + public function create($params = null, $opts = null) + { + return $this->request('post', '/v1/shipping_rates', $params, $opts); + } + + /** + * Returns the shipping rate object with the given ID. + * + * @param string $id + * @param null|array $params + * @param null|array|\Stripe\Util\RequestOptions $opts + * + * @throws \Stripe\Exception\ApiErrorException if the request fails + * + * @return \Stripe\ShippingRate + */ + public function retrieve($id, $params = null, $opts = null) + { + return $this->request('get', $this->buildPath('/v1/shipping_rates/%s', $id), $params, $opts); + } + + /** + * Updates an existing shipping rate 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\ShippingRate + */ + public function update($id, $params = null, $opts = null) + { + return $this->request('post', $this->buildPath('/v1/shipping_rates/%s', $id), $params, $opts); + } +} diff --git a/vendor/stripe/stripe-php/lib/ShippingRate.php b/vendor/stripe/stripe-php/lib/ShippingRate.php new file mode 100644 index 000000000..9091b688c --- /dev/null +++ b/vendor/stripe/stripe-php/lib/ShippingRate.php @@ -0,0 +1,40 @@ +Checkout Sessions + * to collect shipping costs. + * + * @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 shipping rate can be used for new purchases. Defaults to true. + * @property int $created Time at which the object was created. Measured in seconds since the Unix epoch. + * @property null|\Stripe\StripeObject $delivery_estimate The estimated range for how long shipping will take, meant to be displayable to the customer. This will appear on CheckoutSessions. + * @property null|string $display_name The name of the shipping rate, meant to be displayable to the customer. This will appear on CheckoutSessions. + * @property \Stripe\StripeObject $fixed_amount + * @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 $tax_behavior Specifies whether the rate is considered inclusive of taxes or exclusive of taxes. One of inclusive, exclusive, or unspecified. + * @property null|string|\Stripe\TaxCode $tax_code A tax code ID. The Shipping tax code is txcd_92010001. + * @property string $type The type of calculation to use on the shipping rate. Can only be fixed_amount for now. + */ +class ShippingRate extends ApiResource +{ + const OBJECT_NAME = 'shipping_rate'; + + use ApiOperations\All; + use ApiOperations\Create; + use ApiOperations\Retrieve; + use ApiOperations\Update; + + const TAX_BEHAVIOR_EXCLUSIVE = 'exclusive'; + const TAX_BEHAVIOR_INCLUSIVE = 'inclusive'; + const TAX_BEHAVIOR_UNSPECIFIED = 'unspecified'; + + const TYPE_FIXED_AMOUNT = 'fixed_amount'; +} diff --git a/vendor/stripe/stripe-php/lib/SingletonApiResource.php b/vendor/stripe/stripe-php/lib/SingletonApiResource.php index 704cff874..a182ca955 100644 --- a/vendor/stripe/stripe-php/lib/SingletonApiResource.php +++ b/vendor/stripe/stripe-php/lib/SingletonApiResource.php @@ -23,6 +23,8 @@ abstract class SingletonApiResource extends ApiResource { // Replace dots with slashes for namespaced resources, e.g. if the object's name is // "foo.bar", then its URL will be "/v1/foo/bar". + + /** @phpstan-ignore-next-line */ $base = \str_replace('.', '/', static::OBJECT_NAME); return "/v1/{$base}"; diff --git a/vendor/stripe/stripe-php/lib/Stripe.php b/vendor/stripe/stripe-php/lib/Stripe.php index f64dcedd2..54795c5fc 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.94.0'; + const VERSION = '7.105.0'; /** * @return string the API key used for requests @@ -176,7 +176,7 @@ class Stripe } /** - * @return string | null The Stripe account ID for connected account + * @return null|string The Stripe account ID for connected account * requests */ public static function getAccountId() @@ -194,7 +194,7 @@ class Stripe } /** - * @return array | null The application's information + * @return null|array The application's information */ public static function getAppInfo() { diff --git a/vendor/stripe/stripe-php/lib/StripeClient.php b/vendor/stripe/stripe-php/lib/StripeClient.php index 8eae9864e..10d324a94 100644 --- a/vendor/stripe/stripe-php/lib/StripeClient.php +++ b/vendor/stripe/stripe-php/lib/StripeClient.php @@ -48,6 +48,7 @@ namespace Stripe; * @property \Stripe\Service\ReviewService $reviews * @property \Stripe\Service\SetupAttemptService $setupAttempts * @property \Stripe\Service\SetupIntentService $setupIntents + * @property \Stripe\Service\ShippingRateService $shippingRates * @property \Stripe\Service\Sigma\SigmaServiceFactory $sigma * @property \Stripe\Service\SkuService $skus * @property \Stripe\Service\SourceService $sources diff --git a/vendor/stripe/stripe-php/lib/StripeObject.php b/vendor/stripe/stripe-php/lib/StripeObject.php index eca01a00e..9482a0e97 100644 --- a/vendor/stripe/stripe-php/lib/StripeObject.php +++ b/vendor/stripe/stripe-php/lib/StripeObject.php @@ -194,27 +194,32 @@ class StripeObject implements \ArrayAccess, \Countable, \JsonSerializable } // ArrayAccess methods + #[\ReturnTypeWillChange] public function offsetSet($k, $v) { $this->{$k} = $v; } + #[\ReturnTypeWillChange] public function offsetExists($k) { return \array_key_exists($k, $this->_values); } + #[\ReturnTypeWillChange] public function offsetUnset($k) { unset($this->{$k}); } + #[\ReturnTypeWillChange] public function offsetGet($k) { return \array_key_exists($k, $this->_values) ? $this->_values[$k] : null; } // Countable method + #[\ReturnTypeWillChange] public function count() { return \count($this->_values); @@ -419,6 +424,7 @@ class StripeObject implements \ArrayAccess, \Countable, \JsonSerializable } } + #[\ReturnTypeWillChange] public function jsonSerialize() { return $this->toArray(); diff --git a/vendor/stripe/stripe-php/lib/Subscription.php b/vendor/stripe/stripe-php/lib/Subscription.php index 4d7a8a575..a96b53bce 100644 --- a/vendor/stripe/stripe-php/lib/Subscription.php +++ b/vendor/stripe/stripe-php/lib/Subscription.php @@ -114,5 +114,7 @@ class Subscription extends ApiResource $url = $this->instanceUrl() . '/discount'; list($response, $opts) = $this->_request('delete', $url, $params, $opts); $this->refreshFrom(['discount' => null], $opts, true); + + return $this; } } diff --git a/vendor/stripe/stripe-php/lib/TaxRate.php b/vendor/stripe/stripe-php/lib/TaxRate.php index 903363893..5a456378a 100644 --- a/vendor/stripe/stripe-php/lib/TaxRate.php +++ b/vendor/stripe/stripe-php/lib/TaxRate.php @@ -41,8 +41,10 @@ class TaxRate extends ApiResource const TAX_TYPE_GST = 'gst'; const TAX_TYPE_HST = 'hst'; + const TAX_TYPE_JCT = 'jct'; const TAX_TYPE_PST = 'pst'; const TAX_TYPE_QST = 'qst'; + const TAX_TYPE_RST = 'rst'; const TAX_TYPE_SALES_TAX = 'sales_tax'; const TAX_TYPE_VAT = 'vat'; } diff --git a/vendor/stripe/stripe-php/lib/Terminal/ConnectionToken.php b/vendor/stripe/stripe-php/lib/Terminal/ConnectionToken.php index c6405b019..e49a0b0ec 100644 --- a/vendor/stripe/stripe-php/lib/Terminal/ConnectionToken.php +++ b/vendor/stripe/stripe-php/lib/Terminal/ConnectionToken.php @@ -7,11 +7,11 @@ namespace Stripe\Terminal; /** * A Connection Token is used by the Stripe Terminal SDK to connect to a reader. * - * Related guide: Fleet Management. + * Related guide: Fleet + * Management. * * @property string $object String representing the object's type. Objects of the same type share the same value. - * @property string $location The id of the location that this connection token is scoped to. Note that location scoping only applies to internet-connected readers. For more details, see the docs on scoping connection tokens. + * @property string $location The id of the location that this connection token is scoped to. Note that location scoping only applies to internet-connected readers. For more details, see the docs on scoping connection tokens. * @property string $secret Your application should pass this token to the Stripe Terminal SDK. */ class ConnectionToken extends \Stripe\ApiResource diff --git a/vendor/stripe/stripe-php/lib/Terminal/Location.php b/vendor/stripe/stripe-php/lib/Terminal/Location.php index 422cd756a..21a2c6352 100644 --- a/vendor/stripe/stripe-php/lib/Terminal/Location.php +++ b/vendor/stripe/stripe-php/lib/Terminal/Location.php @@ -7,8 +7,8 @@ namespace Stripe\Terminal; /** * A Location represents a grouping of readers. * - * Related guide: Fleet Management. + * Related guide: Fleet + * Management. * * @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/Terminal/Reader.php b/vendor/stripe/stripe-php/lib/Terminal/Reader.php index 44fe035db..28edf434d 100644 --- a/vendor/stripe/stripe-php/lib/Terminal/Reader.php +++ b/vendor/stripe/stripe-php/lib/Terminal/Reader.php @@ -8,13 +8,13 @@ namespace Stripe\Terminal; * A Reader represents a physical device for accepting payment details. * * Related guide: Connecting to a + * href="https://stripe.com/docs/terminal/payments/connect-reader">Connecting to a * Reader. * * @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|string $device_sw_version The current software version of the reader. - * @property string $device_type Type of reader, one of bbpos_chipper2x or verifone_P400. + * @property string $device_type Type of reader, one of bbpos_chipper2x, bbpos_wisepos_e, or verifone_P400. * @property null|string $ip_address The local IP address of the reader. * @property string $label Custom label given to the reader for easier identification. * @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. diff --git a/vendor/stripe/stripe-php/lib/Util/CaseInsensitiveArray.php b/vendor/stripe/stripe-php/lib/Util/CaseInsensitiveArray.php index 670ab0b6a..9f11dc69e 100644 --- a/vendor/stripe/stripe-php/lib/Util/CaseInsensitiveArray.php +++ b/vendor/stripe/stripe-php/lib/Util/CaseInsensitiveArray.php @@ -21,16 +21,19 @@ class CaseInsensitiveArray implements \ArrayAccess, \Countable, \IteratorAggrega $this->container = \array_change_key_case($initial_array, \CASE_LOWER); } + #[\ReturnTypeWillChange] public function count() { return \count($this->container); } + #[\ReturnTypeWillChange] public function getIterator() { return new \ArrayIterator($this->container); } + #[\ReturnTypeWillChange] public function offsetSet($offset, $value) { $offset = static::maybeLowercase($offset); @@ -41,6 +44,7 @@ class CaseInsensitiveArray implements \ArrayAccess, \Countable, \IteratorAggrega } } + #[\ReturnTypeWillChange] public function offsetExists($offset) { $offset = static::maybeLowercase($offset); @@ -48,12 +52,14 @@ class CaseInsensitiveArray implements \ArrayAccess, \Countable, \IteratorAggrega return isset($this->container[$offset]); } + #[\ReturnTypeWillChange] public function offsetUnset($offset) { $offset = static::maybeLowercase($offset); unset($this->container[$offset]); } + #[\ReturnTypeWillChange] public function offsetGet($offset) { $offset = static::maybeLowercase($offset); diff --git a/vendor/stripe/stripe-php/lib/Util/ObjectTypes.php b/vendor/stripe/stripe-php/lib/Util/ObjectTypes.php index c4fefc1b7..f60effdd1 100644 --- a/vendor/stripe/stripe-php/lib/Util/ObjectTypes.php +++ b/vendor/stripe/stripe-php/lib/Util/ObjectTypes.php @@ -79,6 +79,7 @@ class ObjectTypes \Stripe\Review::OBJECT_NAME => \Stripe\Review::class, \Stripe\SetupAttempt::OBJECT_NAME => \Stripe\SetupAttempt::class, \Stripe\SetupIntent::OBJECT_NAME => \Stripe\SetupIntent::class, + \Stripe\ShippingRate::OBJECT_NAME => \Stripe\ShippingRate::class, \Stripe\Sigma\ScheduledQueryRun::OBJECT_NAME => \Stripe\Sigma\ScheduledQueryRun::class, \Stripe\SKU::OBJECT_NAME => \Stripe\SKU::class, \Stripe\Source::OBJECT_NAME => \Stripe\Source::class, diff --git a/vendor/stripe/stripe-php/lib/Util/RandomGenerator.php b/vendor/stripe/stripe-php/lib/Util/RandomGenerator.php index b11e445d2..ccf023ac8 100644 --- a/vendor/stripe/stripe-php/lib/Util/RandomGenerator.php +++ b/vendor/stripe/stripe-php/lib/Util/RandomGenerator.php @@ -28,8 +28,8 @@ class RandomGenerator public function uuid() { $arr = \array_values(\unpack('N1a/n4b/N1c', \openssl_random_pseudo_bytes(16))); - $arr[2] = ($arr[2] & 0x0fff) | 0x4000; - $arr[3] = ($arr[3] & 0x3fff) | 0x8000; + $arr[2] = ($arr[2] & 0x0FFF) | 0x4000; + $arr[3] = ($arr[3] & 0x3FFF) | 0x8000; return \vsprintf('%08x-%04x-%04x-%04x-%04x%08x', $arr); } diff --git a/vendor/stripe/stripe-php/lib/Util/Set.php b/vendor/stripe/stripe-php/lib/Util/Set.php index 017f92978..c39d813ca 100644 --- a/vendor/stripe/stripe-php/lib/Util/Set.php +++ b/vendor/stripe/stripe-php/lib/Util/Set.php @@ -37,6 +37,7 @@ class Set implements IteratorAggregate return \array_keys($this->_elts); } + #[\ReturnTypeWillChange] public function getIterator() { return new ArrayIterator($this->toArray()); diff --git a/vendor/stripe/stripe-php/phpstan-baseline.neon b/vendor/stripe/stripe-php/phpstan-baseline.neon index 882318a7a..e69de29bb 100644 --- a/vendor/stripe/stripe-php/phpstan-baseline.neon +++ b/vendor/stripe/stripe-php/phpstan-baseline.neon @@ -1,12 +0,0 @@ -parameters: - ignoreErrors: - - - message: "#^Access to undefined constant Stripe\\\\ApiResource\\:\\:OBJECT_NAME\\.$#" - count: 1 - path: lib/ApiResource.php - - - - message: "#^Access to undefined constant Stripe\\\\SingletonApiResource\\:\\:OBJECT_NAME\\.$#" - count: 1 - path: lib/SingletonApiResource.php - diff --git a/vendor/stripe/stripe-php/phpstan.neon.dist b/vendor/stripe/stripe-php/phpstan.neon.dist index c99645a2b..fb066c682 100644 --- a/vendor/stripe/stripe-php/phpstan.neon.dist +++ b/vendor/stripe/stripe-php/phpstan.neon.dist @@ -9,3 +9,5 @@ parameters: ignoreErrors: - '#Unsafe usage of new static\(\).#' + + reportUnmatchedIgnoredErrors: false