From d2488266cbbb1b069d5824c6cce422b602ab9a1a Mon Sep 17 00:00:00 2001 From: Ronald Carter Date: Sat, 31 Jul 2021 23:14:47 +1000 Subject: [PATCH 01/27] Added .gitignore of local VS files --- .gitignore | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..e9150297a --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +################################################################################ +# This .gitignore file was automatically created by Microsoft(R) Visual Studio. +################################################################################ + +/.vs From befb060186e505ae11331c2b3a0fdf711431b301 Mon Sep 17 00:00:00 2001 From: Ronald Carter Date: Sat, 31 Jul 2021 23:15:35 +1000 Subject: [PATCH 02/27] Chnage to use a defined variable to select the name used on emails with Active Directory --- conf/config.inc.php | 42 ++++++++++++++++++++++++++++-------------- htdocs/sendtoken.php | 29 +++++++++++++++++++++-------- 2 files changed, 49 insertions(+), 22 deletions(-) diff --git a/conf/config.inc.php b/conf/config.inc.php index fd283c2db..5134e357b 100644 --- a/conf/config.inc.php +++ b/conf/config.inc.php @@ -33,6 +33,20 @@ # false: log only errors and do not display them (use this in production) $debug = false; +# Active Directory mode +# true: use unicodePwd as password field +# false: LDAPv3 standard behavior +$ad_mode = false; +# Force account unlock when password is changed +$ad_options['force_unlock'] = false; +# Force user change password at next login +$ad_options['force_pwd_change'] = false; +# Allow user with expired password to change password +$ad_options['change_expired_password'] = false; +# Set AD attribute for username on emails using sendtoken +# example: $email_field = "displayName" or $email_field = "CN" +$email_field = "displayName" + # LDAP $ldap_url = "ldap://localhost"; $ldap_starttls = false; @@ -43,21 +57,15 @@ $ldap_base = "dc=example,dc=com"; $ldap_login_attribute = "uid"; $ldap_fullname_attribute = "cn"; -$ldap_filter = "(&(objectClass=person)($ldap_login_attribute={login}))"; +# Check and Set options for ad_mode +if ( !empty($ad_mode) ) { + $ldap_filter = "(&(objectClass=person)($ldap_login_attribute={login}))"; +} else { + $ldap_filter = "(&(objectClass=user)(sAMAccountName={login})(!(userAccountControl:1.2.840.113556.1.4.803:=2)))"; +} $ldap_use_exop_passwd = false; $ldap_use_ppolicy_control = false; -# Active Directory mode -# true: use unicodePwd as password field -# false: LDAPv3 standard behavior -$ad_mode = false; -# Force account unlock when password is changed -$ad_options['force_unlock'] = false; -# Force user change password at next login -$ad_options['force_pwd_change'] = false; -# Allow user with expired password to change password -$ad_options['change_expired_password'] = false; - # Samba mode # true: update sambaNTpassword and sambaPwdLastSet attributes too # false: just update the password @@ -193,8 +201,14 @@ $multiple_answers_one_str = false; # Answer attribute should be hidden to users! -$answer_objectClass = "extensibleObject"; -$answer_attribute = "info"; +# Check and Set options for ad_mode +if ( !empty($ad_mode) ) { + $answer_objectClass = "extensibleObject"; + $answer_attribute = "info"; +} else { + $answer_objectClass = "user"; + $answer_attribute = "comment"; +} # Crypt answers inside the directory $crypt_answers = true; diff --git a/htdocs/sendtoken.php b/htdocs/sendtoken.php index b7dac98de..89c4dc3a7 100644 --- a/htdocs/sendtoken.php +++ b/htdocs/sendtoken.php @@ -133,14 +133,21 @@ } } } else { - # Use first available mail adress in ldap - if (count($mailValues) > 0) { - $mailValue = $mailValues[0]; - if (strcasecmp($mail_attribute, "proxyAddresses") == 0) { - $mailValue = str_ireplace("smtp:", "", $mailValue); + # Check if AD_Mode is not used + if ( !empty($ad_mode) ) { + # Use first available mail adress in ldap + if (count($mailValues) > 0) { + $mailValue = $mailValues[0]; + if (strcasecmp($mail_attribute, "proxyAddresses") == 0) { + $mailValue = str_ireplace("smtp:", "", $mailValue); + } + $mail = $mailValue; + $match = true; } - $mail = $mailValue; - $match = true; + } else { + # Retreive Username for AD + #Set Username Varible for E-Mail + $email_name = reset(ldap_get_values($ldap, $entry, $email_field)); } } } @@ -219,7 +226,13 @@ error_log("Send reset URL " . ( $debug ? "$reset_url" : "HIDDEN")); } - $data = array( "login" => $login, "mail" => $mail, "url" => $reset_url ) ; + # Send $Username as "login" if in AD_Mode + if ( !empty($ad_mode) ) { + $data = array( "login" => $login, "mail" => $mail, "url" => $reset_url ) ; + } else { + $data = array( "login" => $email_name , "mail" => $mail, "url" => $reset_url ) ; + } + # Send message if ( send_mail($mailer, $mail, $mail_from, $mail_from_name, $messages["resetsubject"], $messages["resetmessage"].$mail_signature, $data) ) { From a9dc118e5867355d316447926beee70a01cc63af Mon Sep 17 00:00:00 2001 From: RonaldCarter89 <88069959+RonaldCarter89@users.noreply.github.com> Date: Sun, 1 Aug 2021 00:52:29 +1000 Subject: [PATCH 03/27] Update it.inc.php Updated IT Language file due to PHP Unit testing failure --- lang/it.inc.php | 45 +++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/lang/it.inc.php b/lang/it.inc.php index 7ce0c8a36..fdefd04c0 100644 --- a/lang/it.inc.php +++ b/lang/it.inc.php @@ -32,15 +32,18 @@ $messages['newpasswordrequired'] = "Nuova password obbligatoria"; $messages['confirmpasswordrequired'] = "Per favore conferma la nuova password"; $messages['passwordchanged'] = "La tua password e' stata cambiata"; +$messages['sshkeychanged'] = "La vostra chiave SSH è stata cambiata"; $messages['nomatch'] = "Password non corrispondenti"; $messages['badcredentials'] = "Login o password non corretti"; $messages['passworderror'] = "Password rifiutata dalla directory LDAP"; +$messages['sshkeyerror'] = "La chiave SSH è stata rifiutata dalla directory LDAP"; $messages['title'] = "Self service password"; $messages['login'] = "Login"; -$messages['oldpassword'] = "Vecchia password"; +$messages['oldpassword'] = "vecchia password"; $messages['newpassword'] = "Nuova password"; $messages['confirmpassword'] = "Conferma"; $messages['submit'] = "Invia"; +$messages['getuser'] = "Ottieni utente"; $messages['tooshort'] = "Password troppo corta"; $messages['toobig'] = "Password troppo lunga"; $messages['minlower'] = "La password non contiene abbastanza caratteri minuscoli"; @@ -63,18 +66,23 @@ $messages['password'] = "Password"; $messages['question'] = "Domanda"; $messages['answer'] = "Risposta"; -$messages['setquestionshelp'] = "Imposta o cambia la tua domanda/risposta per il reset della password. Potrai poi reimpostare la tua password qui."; $messages['answerrequired'] = "Nessuna risposta inserita"; $messages['questionrequired'] = "Nessuna domanda selezionata"; $messages['passwordrequired'] = "Password obbligatoria"; +$messages['sshkeyrequired'] = "è richiesta la chiave SSH"; +$messages['invalidsshkey'] = "La chiave SSH inserita sembra non valida"; $messages['answermoderror'] = "La tua risposta non e' stata registrata"; $messages['answerchanged'] = "La tua risposta e' stata registrata"; $messages['answernomatch'] = "Risposta non corretta"; $messages['resetbyquestionshelp'] = "Scegli una domanda e rispondi per reimpostare la password. Per farlo devi aver registrato una risposta."; +$messages['setquestionshelp'] = "Imposta o cambia la tua domanda/risposta per il reset della password. Potrai poi reimpostare la tua password qui."; $messages['changehelp'] = "Immetti la tua vecchia password e scegline una nuova."; $messages['changehelpreset'] = "Hai dimenticato la password?"; $messages['changehelpquestions'] = "Reimposta la tua password rispondendo alle domande"; $messages['changehelptoken'] = "Reimposta la tua password con una verifica via mail"; +$messages['changehelpsms'] = "Reimposta la tua password tramite SMS"; +$messages['changehelpsshkey'] = "Cambia la tua chiave SSH"; +$messages['changesshkeyhelp'] = "Inserisci la tua password e la nuova chiave SSH."; $messages['resetmessage'] = "Buongiorno {login},\n\nClicca qui per reimpostare la tua password:\n{url}\n\nSe non sei stato tu a richiedere il reset, per piacere ignora questa email."; $messages['resetsubject'] = "Reimposta la tua password"; $messages['sendtokenhelp'] = "Inserisci la tua login e il tuo indirizzo email per reimpostare la tua password. Quindi clicca sul link che riceverai via mail."; @@ -87,55 +95,48 @@ $messages['tokenrequired'] = "Codice di verifica obbligatorio"; $messages['tokennotvalid'] = "Codice di verifica non valido"; $messages['resetbytokenhelp'] = "Il codice di verifica spedito via mail ti consente di reimpostare la password. Per avere un nuovo codice, clicca qui."; +$messages['resetbysmshelp'] = "Il codice inviato via SMS ti permette di reimpostare la password. Per ricevere un nuovo codice, clicca qui."; $messages['changemessage'] = "Buongiorno {login},\n\nLa tua password e' stata cambiata.\n\nSe non hai richiesto questa modifica, per favore contatta immediatamente il tuo amministratore di rete."; $messages['changesubject'] = "La tua password e' stata cambiata"; +$messages['changesshkeymessage'] = "Ciao {login}, \n\nIl SSH Key è stato modificato. \n\nSe non sei l'autore questo cambiamento, contattare immediatamente l'amministratore."; +$messages['changesshkeysubject'] = "La vostra chiave SSH è stata modificata"; $messages['badcaptcha'] = "Il codice captcha non e' corretto. Riprova."; $messages['captcharequired'] = "The captcha is required."; $messages['captcha'] = "Captcha"; $messages['notcomplex'] = "La tua password non e' abbastanza complessa"; $messages['policycomplex'] = "Numero minimo di tipi di carattere:"; +$messages['sms'] = "Numero dell'SMS"; $messages['smsresetmessage'] = "Il tuo codice per il reset della password e':"; -$messages['smscrypttokensrequired'] = "Non puoi utilizzare il reset via SMS senza crypt_tokens"; +$messages['sendsmshelp'] = "Inserisci la tua login per ricevere il codice di verifica per il reset della password. Inserisci poi il codice ricevuto via SMS."; +$messages['smssent'] = "Un codice di conferma e' stato inviato via SMS"; $messages['smsnotsent'] = "Errore durante l'invio dell'SMS"; -$messages['sms'] = "Numero dell'SMS"; -$messages['smstoken'] = "Codice dell'SMS"; $messages['smsnonumber'] = "Numero di telefono non trovato"; -$messages['username'] = "Username"; -$messages['sendsmshelp'] = "Inserisci la tua login per ricevere il codice di verifica per il reset della password. Inserisci poi il codice ricevuto via SMS."; -$messages['changehelpsms'] = "Reimposta la tua password tramite SMS"; $messages['userfullname'] = "Nome completo dell'utente"; -$messages['getuser'] = "Ottieni utente"; -$messages['resetbysmshelp'] = "Il codice inviato via SMS ti permette di reimpostare la password. Per ricevere un nuovo codice, clicca qui."; -$messages['smssent'] = "Un codice di conferma e' stato inviato via SMS"; +$messages['username'] = "Username"; +$messages['smscrypttokensrequired'] = "Non puoi utilizzare il reset via SMS senza crypt_tokens"; $messages['smsuserfound'] = "Controlla che i dati siano corretti e premi 'Invia' per ricevere il codice via SMS"; +$messages['smstoken'] = "Codice dell'SMS"; +$messages['sshkey'] = "SSH Key"; $messages['nophpmbstring'] = "Devi installare PHP mbstring"; $messages['menuquestions'] = "Domande"; $messages['menutoken'] = "Mail"; $messages['menusms'] = "SMS"; +$messages['menusshkey'] = "Chiave SSH"; $messages['nophpxml'] = "Devi installare PHP XML per usare questo strumento"; $messages['tokenattempts'] = "Token non valido, riprova"; $messages['emptychangeform'] = "Cambia la tua password"; +$messages['emptysshkeychangeform'] = "Cambia la tua chiave SSH"; $messages['emptysendtokenform'] = "Email a password reset link"; $messages['emptyresetbyquestionsform'] = "Reimposta la tua password"; $messages['emptysetquestionsform'] = "Imposta la domanda per il reset della password"; $messages['emptysendsmsform'] = "Ottieni un codice di reset"; $messages['sameaslogin'] = "La nuova password è identica all'utente di login"; $messages['policydifflogin'] = "La nuova password non può essere uguale all'utente di login"; -$messages['changesshkeymessage'] = "Ciao {login}, \n\nIl SSH Key è stato modificato. \n\nSe non sei l'autore questo cambiamento, contattare immediatamente l'amministratore."; -$messages['menusshkey'] = "Chiave SSH"; -$messages['changehelpsshkey'] = "Cambia la tua chiave SSH"; -$messages['sshkeychanged'] = "La vostra chiave SSH è stata cambiata"; -$messages['sshkeyrequired'] = "è richiesta la chiave SSH"; -$messages['changesshkeysubject'] = "La vostra chiave SSH è stata modificata"; -$messages['sshkey'] = "SSH Key"; -$messages['emptysshkeychangeform'] = "Cambia la tua chiave SSH"; -$messages['changesshkeyhelp'] = "Inserire la password e la nuova chiave SSH."; -$messages['sshkeyerror'] = "La chiave SSH è stata rifiutata dalla directory LDAP"; $messages['pwned'] = "La password scelta non è sicura in quanto pubblicata da precedenti intrusioni informatiche internazionali e non può essere usata. Se la stai usando su altri servizi ti consigliamo di cambiarla"; $messages['policypwned'] = "La password non deve essere stata precedentemente pubblicata in intrusioni informatiche internazionali"; $messages['throttle'] = "Troppo veloce! Per favore ritenta fra poco (se sei un essere umano)"; $messages['policydiffminchars'] = "Numero minimo di nuovi caratteri unici:"; -$messages['diffminchars'] = "La nuova password è troppo simile a quella vecchia"; +$messages['changesshkeyhelp'] = "Inserire la password e la nuova chiave SSH."; $messages['specialatends'] = "La nuova password ha il suo unico carattere speciale all'inizio o alla fine"; $messages['policyspecialatends'] = "La nuova password non può aveere il suo unico carattere speciale all'inizio o alla fine"; $messages['checkdatabeforesubmit'] = "Per favore verifica le informazioni prima di inviare il modulo"; From f25170a4a96fccac648e24bdaeda09d02852aa77 Mon Sep 17 00:00:00 2001 From: RonaldCarter89 <88069959+RonaldCarter89@users.noreply.github.com> Date: Sun, 1 Aug 2021 00:55:27 +1000 Subject: [PATCH 04/27] Update it.inc.php --- lang/it.inc.php | 1 + 1 file changed, 1 insertion(+) diff --git a/lang/it.inc.php b/lang/it.inc.php index fdefd04c0..b2a3ae3ad 100644 --- a/lang/it.inc.php +++ b/lang/it.inc.php @@ -136,6 +136,7 @@ $messages['policypwned'] = "La password non deve essere stata precedentemente pubblicata in intrusioni informatiche internazionali"; $messages['throttle'] = "Troppo veloce! Per favore ritenta fra poco (se sei un essere umano)"; $messages['policydiffminchars'] = "Numero minimo di nuovi caratteri unici:"; +$messages['diffminchars'] = "La nuova password è troppo simile a quella vecchia"; $messages['changesshkeyhelp'] = "Inserire la password e la nuova chiave SSH."; $messages['specialatends'] = "La nuova password ha il suo unico carattere speciale all'inizio o alla fine"; $messages['policyspecialatends'] = "La nuova password non può aveere il suo unico carattere speciale all'inizio o alla fine"; From 9981c80ee0fad4e6e88d94ab35f9f0947f89baec Mon Sep 17 00:00:00 2001 From: RonaldCarter89 <88069959+RonaldCarter89@users.noreply.github.com> Date: Sun, 1 Aug 2021 01:40:04 +1000 Subject: [PATCH 05/27] Update .travis.yml Added the other Ubuntu Dist Added Extra PHP version Changed what version of PHPUnit was used based on the PHP Version Chnaged Notificatiosn to Off --- .travis.yml | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9e6aba828..3f4b40687 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,15 @@ language: php -dist: trusty +os: + - linux + + +dist: + - Focal + - Bionic + - Xenial + - Trusty + - Precise php: - '5.4' @@ -9,13 +18,21 @@ php: - '7.0' - '7.1' - '7.2' + - '7.3' - '7.4' + - '8.0' before_install: # If PHP >= 7.0, force use of PHPUnit 5.7 - - if php -r "exit( (int)! version_compare( '$TRAVIS_PHP_VERSION', '7.0', '>=' ) );"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-5.7.phar && chmod +x ~/bin/phpunit; fi + + - if php -r "exit( (int)! version_compare( '$TRAVIS_PHP_VERSION', '5.4', '5.5' ) );"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-4.phar && chmod +x ~/bin/phpunit; fi + - if php -r "exit( (int)! version_compare( '$TRAVIS_PHP_VERSION', '5.6', '5.6' ) );"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-5.phar && chmod +x ~/bin/phpunit; fi + - if php -r "exit( (int)! version_compare( '$TRAVIS_PHP_VERSION', '7.0', '7.0' ) );"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-6.phar && chmod +x ~/bin/phpunit; fi + - if php -r "exit( (int)! version_compare( '$TRAVIS_PHP_VERSION', '7.1', '7.1' ) );"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-7.phar && chmod +x ~/bin/phpunit; fi + - if php -r "exit( (int)! version_compare( '$TRAVIS_PHP_VERSION', '7.2', '7.2' ) );"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-8.phar && chmod +x ~/bin/phpunit; fi + - if php -r "exit( (int)! version_compare( '$TRAVIS_PHP_VERSION', '7.3', '>=' ) );"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-9.phar && chmod +x ~/bin/phpunit; fi script: phpunit tests -notifications: - irc: "irc.freenode.org#ltb-project" +#notifications: +# irc: "irc.freenode.org#ltb-project" From 06cc49b4cf3ec3962bde199c6cf77c2428f77663 Mon Sep 17 00:00:00 2001 From: Ronald Carter Date: Sun, 1 Aug 2021 02:02:05 +1000 Subject: [PATCH 06/27] Changed to Support newer version of PHPUnit test, Changed to use multiple Ubuntu build enviroments --- .travis.yml | 19 ++++++++++++++----- tests/CheckPasswordTest.php | 2 +- tests/CheckSshkeyTest.php | 2 +- tests/CryptoTest.php | 2 +- tests/HookTest.php | 2 +- tests/LangTest.php | 2 +- 6 files changed, 19 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3f4b40687..34cc381e9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,11 +5,20 @@ os: dist: - - Focal - - Bionic - - Xenial - - Trusty - - Precise + "Focal" + "Bionic" + "Xenial" + "Trusty" + "Precise" + +matrix: + include: + - dist: bionic + - dist: focal + - dist: precise + - dist: trusty + - dist: xenial + php: - '5.4' diff --git a/tests/CheckPasswordTest.php b/tests/CheckPasswordTest.php index 5de3854e5..644eee435 100644 --- a/tests/CheckPasswordTest.php +++ b/tests/CheckPasswordTest.php @@ -2,7 +2,7 @@ require_once __DIR__ . '/../lib/vendor/defuse-crypto.phar'; -class CheckPasswordTest extends \PHPUnit_Framework_TestCase +class CheckPasswordTest extends \PHPUnit\Framework\TestCase { /** * Test check_password_strength function diff --git a/tests/CheckSshkeyTest.php b/tests/CheckSshkeyTest.php index 796e4771e..620226445 100644 --- a/tests/CheckSshkeyTest.php +++ b/tests/CheckSshkeyTest.php @@ -1,6 +1,6 @@ Date: Sun, 1 Aug 2021 02:10:02 +1000 Subject: [PATCH 07/27] More refinements --- .travis.yml | 13 ++++--------- tests/CheckPasswordTest.php | 4 +++- tests/CheckSshkeyTest.php | 4 +++- tests/CryptoTest.php | 4 +++- tests/HookTest.php | 4 +++- tests/LangTest.php | 4 +++- 6 files changed, 19 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index 34cc381e9..18cbb9ba5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,22 +3,17 @@ language: php os: - linux - -dist: - "Focal" - "Bionic" - "Xenial" - "Trusty" - "Precise" - matrix: include: - dist: bionic + - dist: focal + - dist: precise + - dist: trusty - - dist: xenial + - dist: xenial php: - '5.4' diff --git a/tests/CheckPasswordTest.php b/tests/CheckPasswordTest.php index 644eee435..56da0be6f 100644 --- a/tests/CheckPasswordTest.php +++ b/tests/CheckPasswordTest.php @@ -2,7 +2,9 @@ require_once __DIR__ . '/../lib/vendor/defuse-crypto.phar'; -class CheckPasswordTest extends \PHPUnit\Framework\TestCase +use PHPUnit\Framework\TestCase; + +class CheckPasswordTest extends TestCase { /** * Test check_password_strength function diff --git a/tests/CheckSshkeyTest.php b/tests/CheckSshkeyTest.php index 620226445..6ee990d96 100644 --- a/tests/CheckSshkeyTest.php +++ b/tests/CheckSshkeyTest.php @@ -1,6 +1,8 @@ Date: Sun, 1 Aug 2021 02:39:55 +1000 Subject: [PATCH 08/27] More changes for Travis --- .travis.yml | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 18cbb9ba5..60e2b94e9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,16 +4,12 @@ os: - linux matrix: - include: - - dist: bionic - - - dist: focal - - - dist: precise - - - dist: trusty - - - dist: xenial + include: + - dist: trusty + - dist: xenial + - dist: bionic + - dist: focal + - dist: precise php: - '5.4' From a38614b75a6d0b229dbd57004ff45f1cf590adbc Mon Sep 17 00:00:00 2001 From: Ronald Carter Date: Sun, 1 Aug 2021 03:04:54 +1000 Subject: [PATCH 09/27] More Travis --- .travis.yml | 75 ++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 60 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index 60e2b94e9..44d9f05e9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,24 +3,69 @@ language: php os: - linux +dist: focal + matrix: include: - - dist: trusty - - dist: xenial + - php: '5.4' + - php: '5.5' + - php: '5.6' + - php: '7.0' + - php: '7.1' + - php: '7.2' + - php: '7.3' + - php: '7.4' + - php: '8.0' + dist: trusty + - php: '5.4' + - php: '5.5' + - php: '5.6' + - php: '7.0' + - php: '7.1' + - php: '7.2' + - php: '7.3' + - php: '7.4' + - php: '8.0' + dist: xenial + - php: '5.4' + - php: '5.5' + - php: '5.6' + - php: '7.0' + - php: '7.1' + - php: '7.2' + - php: '7.3' + - php: '7.4' + - php: '8.0' - dist: bionic - - dist: focal - - dist: precise - -php: - - '5.4' - - '5.5' - - '5.6' - - '7.0' - - '7.1' - - '7.2' - - '7.3' - - '7.4' - - '8.0' + - php: '5.4' + - php: '5.5' + - php: '5.6' + - php: '7.0' + - php: '7.1' + - php: '7.2' + - php: '7.3' + - php: '7.4' + - php: '8.0' + dist: focal + - php: '5.4' + - php: '5.5' + - php: '5.6' + - php: '7.0' + - php: '7.1' + - php: '7.2' + - php: '7.3' + - php: '7.4' + - php: '8.0' + dist: precise + - php: '5.4' + - php: '5.5' + - php: '5.6' + - php: '7.0' + - php: '7.1' + - php: '7.2' + - php: '7.3' + - php: '7.4' + - php: '8.0' before_install: # If PHP >= 7.0, force use of PHPUnit 5.7 From a138f7f64cfd25db42587586186bef1211328037 Mon Sep 17 00:00:00 2001 From: Ronald Carter Date: Sun, 1 Aug 2021 03:17:09 +1000 Subject: [PATCH 10/27] Another attempt at Travis --- .travis.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 44d9f05e9..7126cab85 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,10 +3,9 @@ language: php os: - linux -dist: focal - matrix: include: + - dist: trusty - php: '5.4' - php: '5.5' - php: '5.6' @@ -16,7 +15,7 @@ matrix: - php: '7.3' - php: '7.4' - php: '8.0' - dist: trusty + - dist: trusty - php: '5.4' - php: '5.5' - php: '5.6' @@ -26,7 +25,7 @@ matrix: - php: '7.3' - php: '7.4' - php: '8.0' - dist: xenial + - dist: xenial - php: '5.4' - php: '5.5' - php: '5.6' @@ -46,7 +45,7 @@ matrix: - php: '7.3' - php: '7.4' - php: '8.0' - dist: focal + - dist: focal - php: '5.4' - php: '5.5' - php: '5.6' @@ -56,7 +55,7 @@ matrix: - php: '7.3' - php: '7.4' - php: '8.0' - dist: precise + - dist: precise - php: '5.4' - php: '5.5' - php: '5.6' From 6b0ebf52614c7c04d92e70f94675f404accc3496 Mon Sep 17 00:00:00 2001 From: Ronald Carter Date: Sun, 1 Aug 2021 03:36:41 +1000 Subject: [PATCH 11/27] Yet more Travis --- .travis.yml | 153 ++++++++++++++++++++++++++++++++-------------------- 1 file changed, 95 insertions(+), 58 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7126cab85..f65326652 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,68 +3,105 @@ language: php os: - linux -matrix: +dist: focal + +jobs: + include: + - dist: focal + php: '5.4' + - dist: focal + php: '5.5' + - dist: focal + php: '5.6' + - dist: focal + php: '7.0' + - dist: focal + php: '7.1' + - dist: focal + php: '7.2' + - dist: focal + php: '7.3' + - dist: focal + php: '7.4' + - dist: focal + php: '8.0' + + - dist: bionic + php: '5.4' + - dist: bionic + php: '5.5' + - dist: bionic + php: '5.6' + - dist: bionic + php: '7.0' + - dist: bionic + php: '7.1' + - dist: bionic + php: '7.2' + - dist: bionic + php: '7.3' + - dist: bionic + php: '7.4' + - dist: bionic + php: '8.0' + + - dist: xenial + php: '5.4' + - dist: xenial + php: '5.5' + - dist: xenial + php: '5.6' + - dist: xenial + php: '7.0' + - dist: xenial + php: '7.1' + - dist: xenial + php: '7.2' + - dist: xenial + php: '7.3' + - dist: xenial + php: '7.4' + - dist: xenial + php: '8.0' + - dist: trusty - - php: '5.4' - - php: '5.5' - - php: '5.6' - - php: '7.0' - - php: '7.1' - - php: '7.2' - - php: '7.3' - - php: '7.4' - - php: '8.0' + php: '5.4' - dist: trusty - - php: '5.4' - - php: '5.5' - - php: '5.6' - - php: '7.0' - - php: '7.1' - - php: '7.2' - - php: '7.3' - - php: '7.4' - - php: '8.0' - - dist: xenial - - php: '5.4' - - php: '5.5' - - php: '5.6' - - php: '7.0' - - php: '7.1' - - php: '7.2' - - php: '7.3' - - php: '7.4' - - php: '8.0' - - dist: bionic - - php: '5.4' - - php: '5.5' - - php: '5.6' - - php: '7.0' - - php: '7.1' - - php: '7.2' - - php: '7.3' - - php: '7.4' - - php: '8.0' - - dist: focal - - php: '5.4' - - php: '5.5' - - php: '5.6' - - php: '7.0' - - php: '7.1' - - php: '7.2' - - php: '7.3' - - php: '7.4' - - php: '8.0' + php: '5.5' + - dist: trusty + php: '5.6' + - dist: trusty + php: '7.0' + - dist: trusty + php: '7.1' + - dist: trusty + php: '7.2' + - dist: trusty + php: '7.3' + - dist: trusty + php: '7.4' + - dist: trusty + php: '8.0' + + - dist: precise + php: '5.4' + - dist: precise + php: '5.5' + - dist: precise + php: '5.6' + - dist: precise + php: '7.0' + - dist: precise + php: '7.1' + - dist: precise + php: '7.2' + - dist: precise + php: '7.3' + - dist: precise + php: '7.4' - dist: precise - - php: '5.4' - - php: '5.5' - - php: '5.6' - - php: '7.0' - - php: '7.1' - - php: '7.2' - - php: '7.3' - - php: '7.4' - - php: '8.0' + php: '8.0' before_install: # If PHP >= 7.0, force use of PHPUnit 5.7 From 1603b533d024b3fd546d5da743278c77cd22ff0a Mon Sep 17 00:00:00 2001 From: Ronald Carter Date: Sun, 1 Aug 2021 16:03:06 +1000 Subject: [PATCH 12/27] Chmaged PHP detect logic --- .travis.yml | 66 ++++++++++++++++++++++++++--------------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/.travis.yml b/.travis.yml index f65326652..2a7d56a91 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,31 +8,31 @@ dist: focal jobs: include: - - dist: focal - php: '5.4' - - dist: focal - php: '5.5' - - dist: focal - php: '5.6' - - dist: focal - php: '7.0' - - dist: focal - php: '7.1' - - dist: focal - php: '7.2' - - dist: focal - php: '7.3' +# - dist: focal +# php: '5.4' +# - dist: focal +# php: '5.5' +# - dist: focal +# php: '5.6' +# - dist: focal +# php: '7.0' +# - dist: focal +# php: '7.1' +# - dist: focal +# php: '7.2' +# - dist: focal +# php: '7.3' - dist: focal php: '7.4' - dist: focal php: '8.0' - - dist: bionic - php: '5.4' - - dist: bionic - php: '5.5' - - dist: bionic - php: '5.6' +# - dist: bionic +# php: '5.4' +# - dist: bionic +# php: '5.5' +# - dist: bionic +# php: '5.6' - dist: bionic php: '7.0' - dist: bionic @@ -46,10 +46,10 @@ jobs: - dist: bionic php: '8.0' - - dist: xenial - php: '5.4' - - dist: xenial - php: '5.5' +# - dist: xenial +# php: '5.4' +# - dist: xenial +# php: '5.5' - dist: xenial php: '5.6' - dist: xenial @@ -98,19 +98,19 @@ jobs: php: '7.2' - dist: precise php: '7.3' - - dist: precise - php: '7.4' - - dist: precise - php: '8.0' +# - dist: precise +# php: '7.4' +# - dist: precise +# php: '8.0' before_install: # If PHP >= 7.0, force use of PHPUnit 5.7 - - if php -r "exit( (int)! version_compare( '$TRAVIS_PHP_VERSION', '5.4', '5.5' ) );"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-4.phar && chmod +x ~/bin/phpunit; fi - - if php -r "exit( (int)! version_compare( '$TRAVIS_PHP_VERSION', '5.6', '5.6' ) );"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-5.phar && chmod +x ~/bin/phpunit; fi - - if php -r "exit( (int)! version_compare( '$TRAVIS_PHP_VERSION', '7.0', '7.0' ) );"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-6.phar && chmod +x ~/bin/phpunit; fi - - if php -r "exit( (int)! version_compare( '$TRAVIS_PHP_VERSION', '7.1', '7.1' ) );"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-7.phar && chmod +x ~/bin/phpunit; fi - - if php -r "exit( (int)! version_compare( '$TRAVIS_PHP_VERSION', '7.2', '7.2' ) );"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-8.phar && chmod +x ~/bin/phpunit; fi + - if php -r "exit( (int)! version_compare( '$TRAVIS_PHP_VERSION', '5.4.0', '5.5.99 ) );"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-4.phar && chmod +x ~/bin/phpunit; fi + - if php -r "exit( (int)! version_compare( '$TRAVIS_PHP_VERSION', '5.6.0', '5.6.99' ) );"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-5.phar && chmod +x ~/bin/phpunit; fi + - if php -r "exit( (int)! version_compare( '$TRAVIS_PHP_VERSION', '7.0.0', '7.0.99' ) );"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-6.phar && chmod +x ~/bin/phpunit; fi + - if php -r "exit( (int)! version_compare( '$TRAVIS_PHP_VERSION', '7.1.0', '7.1.99' ) );"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-7.phar && chmod +x ~/bin/phpunit; fi + - if php -r "exit( (int)! version_compare( '$TRAVIS_PHP_VERSION', '7.2.0', '7.2.99' ) );"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-8.phar && chmod +x ~/bin/phpunit; fi - if php -r "exit( (int)! version_compare( '$TRAVIS_PHP_VERSION', '7.3', '>=' ) );"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-9.phar && chmod +x ~/bin/phpunit; fi script: phpunit tests From 27371a3abce08d0362f79aa601f6bf8f75d6c4ef Mon Sep 17 00:00:00 2001 From: Ronald Carter Date: Sun, 1 Aug 2021 17:56:24 +1000 Subject: [PATCH 13/27] Modified PHP logic --- .travis.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2a7d56a91..772509d7f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -105,15 +105,15 @@ jobs: before_install: # If PHP >= 7.0, force use of PHPUnit 5.7 + - if {[version_compare($TRAVIS_PHP_VERSION, '5.4.0') >= 0) && version_compare($TRAVIS_PHP_VERSION, '5.6.0') <= 0)]};"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-4.phar && chmod +x ~/bin/phpunit; fi + - if {[version_compare($TRAVIS_PHP_VERSION, '5.6.0') >= 0) && version_compare($TRAVIS_PHP_VERSION, '7.0.0') <= 0)]};"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-5.phar && chmod +x ~/bin/phpunit; fi + - if {[version_compare($TRAVIS_PHP_VERSION, '7.0.0') >= 0) && version_compare($TRAVIS_PHP_VERSION, '7.1.0') <= 0)]};"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-6.phar && chmod +x ~/bin/phpunit; fi + - if {[version_compare($TRAVIS_PHP_VERSION, '7.1.0') >= 0) && version_compare($TRAVIS_PHP_VERSION, '7.2.0') <= 0)]};"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-7.phar && chmod +x ~/bin/phpunit; fi + - if {[version_compare($TRAVIS_PHP_VERSION, '7.2.0') >= 0) && version_compare($TRAVIS_PHP_VERSION, '7.3.0') <= 0)]};"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-8.phar && chmod +x ~/bin/phpunit; fi + - if [version_compare($TRAVIS_PHP_VERSION, '7.3.0') >= 0)];"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-9.phar && chmod +x ~/bin/phpunit; fi - - if php -r "exit( (int)! version_compare( '$TRAVIS_PHP_VERSION', '5.4.0', '5.5.99 ) );"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-4.phar && chmod +x ~/bin/phpunit; fi - - if php -r "exit( (int)! version_compare( '$TRAVIS_PHP_VERSION', '5.6.0', '5.6.99' ) );"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-5.phar && chmod +x ~/bin/phpunit; fi - - if php -r "exit( (int)! version_compare( '$TRAVIS_PHP_VERSION', '7.0.0', '7.0.99' ) );"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-6.phar && chmod +x ~/bin/phpunit; fi - - if php -r "exit( (int)! version_compare( '$TRAVIS_PHP_VERSION', '7.1.0', '7.1.99' ) );"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-7.phar && chmod +x ~/bin/phpunit; fi - - if php -r "exit( (int)! version_compare( '$TRAVIS_PHP_VERSION', '7.2.0', '7.2.99' ) );"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-8.phar && chmod +x ~/bin/phpunit; fi - - if php -r "exit( (int)! version_compare( '$TRAVIS_PHP_VERSION', '7.3', '>=' ) );"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-9.phar && chmod +x ~/bin/phpunit; fi - -script: phpunit tests +script: + phpunit tests #notifications: # irc: "irc.freenode.org#ltb-project" From fe94c1cb4d89219d9502f6383b1d7b219586f093 Mon Sep 17 00:00:00 2001 From: Ronald Carter Date: Sun, 1 Aug 2021 17:59:17 +1000 Subject: [PATCH 14/27] Chnaged from && to and --- .travis.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 772509d7f..2d13845b5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -105,12 +105,12 @@ jobs: before_install: # If PHP >= 7.0, force use of PHPUnit 5.7 - - if {[version_compare($TRAVIS_PHP_VERSION, '5.4.0') >= 0) && version_compare($TRAVIS_PHP_VERSION, '5.6.0') <= 0)]};"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-4.phar && chmod +x ~/bin/phpunit; fi - - if {[version_compare($TRAVIS_PHP_VERSION, '5.6.0') >= 0) && version_compare($TRAVIS_PHP_VERSION, '7.0.0') <= 0)]};"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-5.phar && chmod +x ~/bin/phpunit; fi - - if {[version_compare($TRAVIS_PHP_VERSION, '7.0.0') >= 0) && version_compare($TRAVIS_PHP_VERSION, '7.1.0') <= 0)]};"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-6.phar && chmod +x ~/bin/phpunit; fi - - if {[version_compare($TRAVIS_PHP_VERSION, '7.1.0') >= 0) && version_compare($TRAVIS_PHP_VERSION, '7.2.0') <= 0)]};"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-7.phar && chmod +x ~/bin/phpunit; fi - - if {[version_compare($TRAVIS_PHP_VERSION, '7.2.0') >= 0) && version_compare($TRAVIS_PHP_VERSION, '7.3.0') <= 0)]};"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-8.phar && chmod +x ~/bin/phpunit; fi - - if [version_compare($TRAVIS_PHP_VERSION, '7.3.0') >= 0)];"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-9.phar && chmod +x ~/bin/phpunit; fi + - if {[version_compare($TRAVIS_PHP_VERSION, '5.4.0') >= 0) and version_compare($TRAVIS_PHP_VERSION, '5.6.0') <= 0)]};"; then mkdir -p ~/bin and wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-4.phar and chmod +x ~/bin/phpunit; fi + - if {[version_compare($TRAVIS_PHP_VERSION, '5.6.0') >= 0) and version_compare($TRAVIS_PHP_VERSION, '7.0.0') <= 0)]};"; then mkdir -p ~/bin and wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-5.phar and chmod +x ~/bin/phpunit; fi + - if {[version_compare($TRAVIS_PHP_VERSION, '7.0.0') >= 0) and version_compare($TRAVIS_PHP_VERSION, '7.1.0') <= 0)]};"; then mkdir -p ~/bin and wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-6.phar and chmod +x ~/bin/phpunit; fi + - if {[version_compare($TRAVIS_PHP_VERSION, '7.1.0') >= 0) and version_compare($TRAVIS_PHP_VERSION, '7.2.0') <= 0)]};"; then mkdir -p ~/bin and wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-7.phar and chmod +x ~/bin/phpunit; fi + - if {[version_compare($TRAVIS_PHP_VERSION, '7.2.0') >= 0) and version_compare($TRAVIS_PHP_VERSION, '7.3.0') <= 0)]};"; then mkdir -p ~/bin and wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-8.phar and chmod +x ~/bin/phpunit; fi + - if [version_compare($TRAVIS_PHP_VERSION, '7.3.0') >= 0)];"; then mkdir -p ~/bin and wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-9.phar and chmod +x ~/bin/phpunit; fi script: phpunit tests From 114ee2e04de3e3cf25a0f26cb7423f5a9ef607db Mon Sep 17 00:00:00 2001 From: Ronald Carter Date: Sun, 1 Aug 2021 18:06:28 +1000 Subject: [PATCH 15/27] More PHP logic fixes --- .travis.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2d13845b5..6ea6d702b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -105,12 +105,12 @@ jobs: before_install: # If PHP >= 7.0, force use of PHPUnit 5.7 - - if {[version_compare($TRAVIS_PHP_VERSION, '5.4.0') >= 0) and version_compare($TRAVIS_PHP_VERSION, '5.6.0') <= 0)]};"; then mkdir -p ~/bin and wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-4.phar and chmod +x ~/bin/phpunit; fi - - if {[version_compare($TRAVIS_PHP_VERSION, '5.6.0') >= 0) and version_compare($TRAVIS_PHP_VERSION, '7.0.0') <= 0)]};"; then mkdir -p ~/bin and wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-5.phar and chmod +x ~/bin/phpunit; fi - - if {[version_compare($TRAVIS_PHP_VERSION, '7.0.0') >= 0) and version_compare($TRAVIS_PHP_VERSION, '7.1.0') <= 0)]};"; then mkdir -p ~/bin and wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-6.phar and chmod +x ~/bin/phpunit; fi - - if {[version_compare($TRAVIS_PHP_VERSION, '7.1.0') >= 0) and version_compare($TRAVIS_PHP_VERSION, '7.2.0') <= 0)]};"; then mkdir -p ~/bin and wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-7.phar and chmod +x ~/bin/phpunit; fi - - if {[version_compare($TRAVIS_PHP_VERSION, '7.2.0') >= 0) and version_compare($TRAVIS_PHP_VERSION, '7.3.0') <= 0)]};"; then mkdir -p ~/bin and wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-8.phar and chmod +x ~/bin/phpunit; fi - - if [version_compare($TRAVIS_PHP_VERSION, '7.3.0') >= 0)];"; then mkdir -p ~/bin and wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-9.phar and chmod +x ~/bin/phpunit; fi + - if php -r "exit((version_compare($TRAVIS_PHP_VERSION, '5.4.0') >= 0) and (version_compare($TRAVIS_PHP_VERSION, '5.6.0') <= 0)));"; then mkdir -p ~/bin and wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-4.phar and chmod +x ~/bin/phpunit; fi + - if php -r "exit((version_compare($TRAVIS_PHP_VERSION, '5.6.0') >= 0) and (version_compare($TRAVIS_PHP_VERSION, '7.0.0') <= 0)));"; then mkdir -p ~/bin and wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-5.phar and chmod +x ~/bin/phpunit; fi + - if php -r "exit((version_compare($TRAVIS_PHP_VERSION, '7.0.0') >= 0) and (version_compare($TRAVIS_PHP_VERSION, '7.1.0') <= 0)));"; then mkdir -p ~/bin and wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-6.phar and chmod +x ~/bin/phpunit; fi + - if php -r "exit((version_compare($TRAVIS_PHP_VERSION, '7.1.0') >= 0) and (version_compare($TRAVIS_PHP_VERSION, '7.2.0') <= 0)));"; then mkdir -p ~/bin and wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-7.phar and chmod +x ~/bin/phpunit; fi + - if php -r "exit((version_compare($TRAVIS_PHP_VERSION, '7.2.0') >= 0) and (version_compare($TRAVIS_PHP_VERSION, '7.3.0') <= 0)));"; then mkdir -p ~/bin and wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-8.phar and chmod +x ~/bin/phpunit; fi + - if php -r "exit(version_compare($TRAVIS_PHP_VERSION, '7.3.0') >= 0);"; then mkdir -p ~/bin and wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-9.phar and chmod +x ~/bin/phpunit; fi script: phpunit tests From 9269f118215fb68a3d774270a7a9744803d7eb9e Mon Sep 17 00:00:00 2001 From: Ronald Carter Date: Sun, 1 Aug 2021 18:14:47 +1000 Subject: [PATCH 16/27] Yet more PHP logic --- .travis.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6ea6d702b..77b07e19c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -105,12 +105,12 @@ jobs: before_install: # If PHP >= 7.0, force use of PHPUnit 5.7 - - if php -r "exit((version_compare($TRAVIS_PHP_VERSION, '5.4.0') >= 0) and (version_compare($TRAVIS_PHP_VERSION, '5.6.0') <= 0)));"; then mkdir -p ~/bin and wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-4.phar and chmod +x ~/bin/phpunit; fi - - if php -r "exit((version_compare($TRAVIS_PHP_VERSION, '5.6.0') >= 0) and (version_compare($TRAVIS_PHP_VERSION, '7.0.0') <= 0)));"; then mkdir -p ~/bin and wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-5.phar and chmod +x ~/bin/phpunit; fi - - if php -r "exit((version_compare($TRAVIS_PHP_VERSION, '7.0.0') >= 0) and (version_compare($TRAVIS_PHP_VERSION, '7.1.0') <= 0)));"; then mkdir -p ~/bin and wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-6.phar and chmod +x ~/bin/phpunit; fi - - if php -r "exit((version_compare($TRAVIS_PHP_VERSION, '7.1.0') >= 0) and (version_compare($TRAVIS_PHP_VERSION, '7.2.0') <= 0)));"; then mkdir -p ~/bin and wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-7.phar and chmod +x ~/bin/phpunit; fi - - if php -r "exit((version_compare($TRAVIS_PHP_VERSION, '7.2.0') >= 0) and (version_compare($TRAVIS_PHP_VERSION, '7.3.0') <= 0)));"; then mkdir -p ~/bin and wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-8.phar and chmod +x ~/bin/phpunit; fi - - if php -r "exit(version_compare($TRAVIS_PHP_VERSION, '7.3.0') >= 0);"; then mkdir -p ~/bin and wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-9.phar and chmod +x ~/bin/phpunit; fi + - if php -r "exit( (int)! (version_compare( '$TRAVIS_PHP_VERSION', '5.4.0' ) >= 0 ) and (version_compare( '$TRAVIS_PHP_VERSION', '5.6.0' ) <= 0 );"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-4.phar && chmod +x ~/bin/phpunit; fi + - if php -r "exit( (int)! version_compare( '$TRAVIS_PHP_VERSION', '5.6.0' ) >= 0 ) and (version_compare( '$TRAVIS_PHP_VERSION', '7.0.0' ) <= 0 );"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-5.phar && chmod +x ~/bin/phpunit; fi + - if php -r "exit( (int)! version_compare( '$TRAVIS_PHP_VERSION', '7.0.0' ) >= 0 ) and (version_compare( '$TRAVIS_PHP_VERSION', '7.1.0' ) <= 0 );"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-6.phar && chmod +x ~/bin/phpunit; fi + - if php -r "exit( (int)! version_compare( '$TRAVIS_PHP_VERSION', '7.1.0 ) >= 0 ) and (version_compare( '$TRAVIS_PHP_VERSION', '7.2.0' ) <= 0 );"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-7.phar && chmod +x ~/bin/phpunit; fi + - if php -r "exit( (int)! version_compare( '$TRAVIS_PHP_VERSION', '7.2.0' ) >= 0 ) and (version_compare( '$TRAVIS_PHP_VERSION', '7.3.0' ) <= 0 );"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-8.phar && chmod +x ~/bin/phpunit; fi + - if php -r "exit( (int)! version_compare( '$TRAVIS_PHP_VERSION', '7.3.0' ) >= 0 );"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-9.phar && chmod +x ~/bin/phpunit; fi script: phpunit tests From 5e908f808bc817d2a48e1db9eb18785ee03cbc8d Mon Sep 17 00:00:00 2001 From: Ronald Carter Date: Sun, 1 Aug 2021 18:20:53 +1000 Subject: [PATCH 17/27] So sick of PHP logic --- .travis.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 77b07e19c..dfefa3399 100644 --- a/.travis.yml +++ b/.travis.yml @@ -105,12 +105,12 @@ jobs: before_install: # If PHP >= 7.0, force use of PHPUnit 5.7 - - if php -r "exit( (int)! (version_compare( '$TRAVIS_PHP_VERSION', '5.4.0' ) >= 0 ) and (version_compare( '$TRAVIS_PHP_VERSION', '5.6.0' ) <= 0 );"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-4.phar && chmod +x ~/bin/phpunit; fi - - if php -r "exit( (int)! version_compare( '$TRAVIS_PHP_VERSION', '5.6.0' ) >= 0 ) and (version_compare( '$TRAVIS_PHP_VERSION', '7.0.0' ) <= 0 );"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-5.phar && chmod +x ~/bin/phpunit; fi - - if php -r "exit( (int)! version_compare( '$TRAVIS_PHP_VERSION', '7.0.0' ) >= 0 ) and (version_compare( '$TRAVIS_PHP_VERSION', '7.1.0' ) <= 0 );"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-6.phar && chmod +x ~/bin/phpunit; fi - - if php -r "exit( (int)! version_compare( '$TRAVIS_PHP_VERSION', '7.1.0 ) >= 0 ) and (version_compare( '$TRAVIS_PHP_VERSION', '7.2.0' ) <= 0 );"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-7.phar && chmod +x ~/bin/phpunit; fi - - if php -r "exit( (int)! version_compare( '$TRAVIS_PHP_VERSION', '7.2.0' ) >= 0 ) and (version_compare( '$TRAVIS_PHP_VERSION', '7.3.0' ) <= 0 );"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-8.phar && chmod +x ~/bin/phpunit; fi - - if php -r "exit( (int)! version_compare( '$TRAVIS_PHP_VERSION', '7.3.0' ) >= 0 );"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-9.phar && chmod +x ~/bin/phpunit; fi + - if php -r "exit( (int)! (version_compare( '$TRAVIS_PHP_VERSION', '5.4.0' ) >= 0 ) and (version_compare( '$TRAVIS_PHP_VERSION', '5.6.0' ) <= 0 ));"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-4.phar && chmod +x ~/bin/phpunit; fi + - if php -r "exit( (int)! (version_compare( '$TRAVIS_PHP_VERSION', '5.6.0' ) >= 0 ) and (version_compare( '$TRAVIS_PHP_VERSION', '7.0.0' ) <= 0 ));"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-5.phar && chmod +x ~/bin/phpunit; fi + - if php -r "exit( (int)! (version_compare( '$TRAVIS_PHP_VERSION', '7.0.0' ) >= 0 ) and (version_compare( '$TRAVIS_PHP_VERSION', '7.1.0' ) <= 0 ));"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-6.phar && chmod +x ~/bin/phpunit; fi + - if php -r "exit( (int)! (version_compare( '$TRAVIS_PHP_VERSION', '7.1.0 ) >= 0 ) and (version_compare( '$TRAVIS_PHP_VERSION', '7.2.0' ) <= 0 ));"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-7.phar && chmod +x ~/bin/phpunit; fi + - if php -r "exit( (int)! (version_compare( '$TRAVIS_PHP_VERSION', '7.2.0' ) >= 0 ) and (version_compare( '$TRAVIS_PHP_VERSION', '7.3.0' ) <= 0 ));"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-8.phar && chmod +x ~/bin/phpunit; fi + - if php -r "exit( (int)! (version_compare( '$TRAVIS_PHP_VERSION', '7.3.0' ) >= 0 ));"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-9.phar && chmod +x ~/bin/phpunit; fi script: phpunit tests From 35d85e39ec90b8487c50a59e93382b2272e811ae Mon Sep 17 00:00:00 2001 From: Ronald Carter Date: Sun, 1 Aug 2021 18:26:41 +1000 Subject: [PATCH 18/27] PHP Logic!!!!! --- .travis.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index dfefa3399..0fe0de58f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -105,11 +105,11 @@ jobs: before_install: # If PHP >= 7.0, force use of PHPUnit 5.7 - - if php -r "exit( (int)! (version_compare( '$TRAVIS_PHP_VERSION', '5.4.0' ) >= 0 ) and (version_compare( '$TRAVIS_PHP_VERSION', '5.6.0' ) <= 0 ));"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-4.phar && chmod +x ~/bin/phpunit; fi - - if php -r "exit( (int)! (version_compare( '$TRAVIS_PHP_VERSION', '5.6.0' ) >= 0 ) and (version_compare( '$TRAVIS_PHP_VERSION', '7.0.0' ) <= 0 ));"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-5.phar && chmod +x ~/bin/phpunit; fi - - if php -r "exit( (int)! (version_compare( '$TRAVIS_PHP_VERSION', '7.0.0' ) >= 0 ) and (version_compare( '$TRAVIS_PHP_VERSION', '7.1.0' ) <= 0 ));"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-6.phar && chmod +x ~/bin/phpunit; fi - - if php -r "exit( (int)! (version_compare( '$TRAVIS_PHP_VERSION', '7.1.0 ) >= 0 ) and (version_compare( '$TRAVIS_PHP_VERSION', '7.2.0' ) <= 0 ));"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-7.phar && chmod +x ~/bin/phpunit; fi - - if php -r "exit( (int)! (version_compare( '$TRAVIS_PHP_VERSION', '7.2.0' ) >= 0 ) and (version_compare( '$TRAVIS_PHP_VERSION', '7.3.0' ) <= 0 ));"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-8.phar && chmod +x ~/bin/phpunit; fi + - if php -r "exit( (int)! (version_compare( '$TRAVIS_PHP_VERSION', '5.4.0' ) >= 0 ) and (version_compare( '$TRAVIS_PHP_VERSION', '5.6.0' ) <= 0 ) );"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-4.phar && chmod +x ~/bin/phpunit; fi + - if php -r "exit( (int)! (version_compare( '$TRAVIS_PHP_VERSION', '5.6.0' ) >= 0 ) and (version_compare( '$TRAVIS_PHP_VERSION', '7.0.0' ) <= 0 ) );"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-5.phar && chmod +x ~/bin/phpunit; fi + - if php -r "exit( (int)! (version_compare( '$TRAVIS_PHP_VERSION', '7.0.0' ) >= 0 ) and (version_compare( '$TRAVIS_PHP_VERSION', '7.1.0' ) <= 0 ) );"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-6.phar && chmod +x ~/bin/phpunit; fi + - if php -r "exit( (int)! (version_compare( '$TRAVIS_PHP_VERSION', '7.1.0 ) >= 0 ) and (version_compare( '$TRAVIS_PHP_VERSION', '7.2.0' ) <= 0 ) );"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-7.phar && chmod +x ~/bin/phpunit; fi + - if php -r "exit( (int)! (version_compare( '$TRAVIS_PHP_VERSION', '7.2.0' ) >= 0 ) and (version_compare( '$TRAVIS_PHP_VERSION', '7.3.0' ) <= 0 ) );"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-8.phar && chmod +x ~/bin/phpunit; fi - if php -r "exit( (int)! (version_compare( '$TRAVIS_PHP_VERSION', '7.3.0' ) >= 0 ));"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-9.phar && chmod +x ~/bin/phpunit; fi script: From 18bd3b85838ff27f7d8edaca7bde0cffd7f2b0f6 Mon Sep 17 00:00:00 2001 From: Ronald Carter Date: Sun, 1 Aug 2021 18:38:22 +1000 Subject: [PATCH 19/27] PHP detect still --- .travis.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0fe0de58f..b2cef79fa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -105,12 +105,12 @@ jobs: before_install: # If PHP >= 7.0, force use of PHPUnit 5.7 - - if php -r "exit( (int)! (version_compare( '$TRAVIS_PHP_VERSION', '5.4.0' ) >= 0 ) and (version_compare( '$TRAVIS_PHP_VERSION', '5.6.0' ) <= 0 ) );"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-4.phar && chmod +x ~/bin/phpunit; fi - - if php -r "exit( (int)! (version_compare( '$TRAVIS_PHP_VERSION', '5.6.0' ) >= 0 ) and (version_compare( '$TRAVIS_PHP_VERSION', '7.0.0' ) <= 0 ) );"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-5.phar && chmod +x ~/bin/phpunit; fi - - if php -r "exit( (int)! (version_compare( '$TRAVIS_PHP_VERSION', '7.0.0' ) >= 0 ) and (version_compare( '$TRAVIS_PHP_VERSION', '7.1.0' ) <= 0 ) );"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-6.phar && chmod +x ~/bin/phpunit; fi - - if php -r "exit( (int)! (version_compare( '$TRAVIS_PHP_VERSION', '7.1.0 ) >= 0 ) and (version_compare( '$TRAVIS_PHP_VERSION', '7.2.0' ) <= 0 ) );"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-7.phar && chmod +x ~/bin/phpunit; fi - - if php -r "exit( (int)! (version_compare( '$TRAVIS_PHP_VERSION', '7.2.0' ) >= 0 ) and (version_compare( '$TRAVIS_PHP_VERSION', '7.3.0' ) <= 0 ) );"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-8.phar && chmod +x ~/bin/phpunit; fi - - if php -r "exit( (int)! (version_compare( '$TRAVIS_PHP_VERSION', '7.3.0' ) >= 0 ));"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-9.phar && chmod +x ~/bin/phpunit; fi + - if php -r "exit( (int)! (version_compare( '${TRAVIS_PHP_VERSION:0:5}', '5.4.0' ) >= 0 ) and (version_compare( '${TRAVIS_PHP_VERSION:0:5}', '5.6.0' ) <= 0 ) );"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-4.phar && chmod +x ~/bin/phpunit; fi + - if php -r "exit( (int)! (version_compare( '${TRAVIS_PHP_VERSION:0:5}', '5.6.0' ) >= 0 ) and (version_compare( '${TRAVIS_PHP_VERSION:0:5}', '7.0.0' ) <= 0 ) );"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-5.phar && chmod +x ~/bin/phpunit; fi + - if php -r "exit( (int)! (version_compare( '${TRAVIS_PHP_VERSION:0:5}', '7.0.0' ) >= 0 ) and (version_compare( '${TRAVIS_PHP_VERSION:0:5}'', '7.1.0' ) <= 0 ) );"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-6.phar && chmod +x ~/bin/phpunit; fi + - if php -r "exit( (int)! (version_compare( '${TRAVIS_PHP_VERSION:0:5}', '7.1.0 ) >= 0 ) and (version_compare( '${TRAVIS_PHP_VERSION:0:5}', '7.2.0' ) <= 0 ) );"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-7.phar && chmod +x ~/bin/phpunit; fi + - if php -r "exit( (int)! (version_compare( '${TRAVIS_PHP_VERSION:0:5}', '7.2.0' ) >= 0 ) and (version_compare( '${TRAVIS_PHP_VERSION:0:5}, '7.3.0' ) <= 0 ) );"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-8.phar && chmod +x ~/bin/phpunit; fi + - if php -r "exit( (int)! (version_compare( '${TRAVIS_PHP_VERSION:0:5}', '7.3.0' ) >= 0 ));"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-9.phar && chmod +x ~/bin/phpunit; fi script: phpunit tests From ce468157cbfd082fb0ab433885a639771d15b728 Mon Sep 17 00:00:00 2001 From: Ronald Carter Date: Sun, 1 Aug 2021 18:43:03 +1000 Subject: [PATCH 20/27] Removed PHP Detection will try Travis PHPUnit --- .travis.yml | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index b2cef79fa..f58376b1b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,8 +33,8 @@ jobs: # php: '5.5' # - dist: bionic # php: '5.6' - - dist: bionic - php: '7.0' +# - dist: bionic +# php: '7.0' - dist: bionic php: '7.1' - dist: bionic @@ -103,15 +103,6 @@ jobs: # - dist: precise # php: '8.0' -before_install: - # If PHP >= 7.0, force use of PHPUnit 5.7 - - if php -r "exit( (int)! (version_compare( '${TRAVIS_PHP_VERSION:0:5}', '5.4.0' ) >= 0 ) and (version_compare( '${TRAVIS_PHP_VERSION:0:5}', '5.6.0' ) <= 0 ) );"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-4.phar && chmod +x ~/bin/phpunit; fi - - if php -r "exit( (int)! (version_compare( '${TRAVIS_PHP_VERSION:0:5}', '5.6.0' ) >= 0 ) and (version_compare( '${TRAVIS_PHP_VERSION:0:5}', '7.0.0' ) <= 0 ) );"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-5.phar && chmod +x ~/bin/phpunit; fi - - if php -r "exit( (int)! (version_compare( '${TRAVIS_PHP_VERSION:0:5}', '7.0.0' ) >= 0 ) and (version_compare( '${TRAVIS_PHP_VERSION:0:5}'', '7.1.0' ) <= 0 ) );"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-6.phar && chmod +x ~/bin/phpunit; fi - - if php -r "exit( (int)! (version_compare( '${TRAVIS_PHP_VERSION:0:5}', '7.1.0 ) >= 0 ) and (version_compare( '${TRAVIS_PHP_VERSION:0:5}', '7.2.0' ) <= 0 ) );"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-7.phar && chmod +x ~/bin/phpunit; fi - - if php -r "exit( (int)! (version_compare( '${TRAVIS_PHP_VERSION:0:5}', '7.2.0' ) >= 0 ) and (version_compare( '${TRAVIS_PHP_VERSION:0:5}, '7.3.0' ) <= 0 ) );"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-8.phar && chmod +x ~/bin/phpunit; fi - - if php -r "exit( (int)! (version_compare( '${TRAVIS_PHP_VERSION:0:5}', '7.3.0' ) >= 0 ));"; then mkdir -p ~/bin && wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-9.phar && chmod +x ~/bin/phpunit; fi - script: phpunit tests From a8f0e05e8b43741ba2997d9884f952229f999ae6 Mon Sep 17 00:00:00 2001 From: Ronald Carter <88069959+RonaldCarter89@users.noreply.github.com> Date: Mon, 2 Aug 2021 00:23:49 +1000 Subject: [PATCH 21/27] Create php.yml --- .github/workflows/php.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 .github/workflows/php.yml diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml new file mode 100644 index 000000000..f57542e40 --- /dev/null +++ b/.github/workflows/php.yml @@ -0,0 +1,19 @@ +name: CI PHPUnit + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +jobs: + run: + name: test on ${{ matrix.operating-system }} and ${{ matrix.php-versions}} + runs-on: ${{ matrix.operating-system }} + strategy: + matrix: + operating-system: ['ubuntu-16.04', 'ubuntu-1804', 'ubuntu20.04'] + php-versions: ['5.3', '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1' ] + + steps: + - uses: actions/checkout@v1 From b464b4a765e1082322b44f6533da21dc5d35bdc1 Mon Sep 17 00:00:00 2001 From: Ronald Carter <88069959+RonaldCarter89@users.noreply.github.com> Date: Mon, 2 Aug 2021 00:32:58 +1000 Subject: [PATCH 22/27] Update php.yml --- .github/workflows/php.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index f57542e40..404b056f7 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -16,4 +16,8 @@ jobs: php-versions: ['5.3', '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1' ] steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 + + - name: PHPUnit Tests + uses: php/actions/phpunit@v2 + From c54400b413dd9cba0e6f782a23c5de80602b5209 Mon Sep 17 00:00:00 2001 From: Ronald Carter <88069959+RonaldCarter89@users.noreply.github.com> Date: Mon, 2 Aug 2021 00:35:33 +1000 Subject: [PATCH 23/27] Update php.yml --- .github/workflows/php.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index 404b056f7..c31d4eec9 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -8,7 +8,7 @@ on: jobs: run: - name: test on ${{ matrix.operating-system }} and ${{ matrix.php-versions}} + name: test on Ubunut version ${{ matrix.operating-system }} with PHP of ${{ matrix.php-versions}} runs-on: ${{ matrix.operating-system }} strategy: matrix: @@ -20,4 +20,6 @@ jobs: - name: PHPUnit Tests uses: php/actions/phpunit@v2 + wiht: + command: tests/ From cb87cf4e7a74cd3c840583fdc3cb686a6df809b0 Mon Sep 17 00:00:00 2001 From: Ronald Carter <88069959+RonaldCarter89@users.noreply.github.com> Date: Mon, 2 Aug 2021 00:36:30 +1000 Subject: [PATCH 24/27] Update php.yml --- .github/workflows/php.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index c31d4eec9..84918d363 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -20,6 +20,6 @@ jobs: - name: PHPUnit Tests uses: php/actions/phpunit@v2 - wiht: - command: tests/ + with: + command: tests/ From d0d6886f4a2535ad3cf626ec37b1a6c65b346001 Mon Sep 17 00:00:00 2001 From: Ronald Carter <88069959+RonaldCarter89@users.noreply.github.com> Date: Mon, 2 Aug 2021 00:38:13 +1000 Subject: [PATCH 25/27] Update php.yml --- .github/workflows/php.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index 84918d363..c2a6177b9 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -12,14 +12,14 @@ jobs: runs-on: ${{ matrix.operating-system }} strategy: matrix: - operating-system: ['ubuntu-16.04', 'ubuntu-1804', 'ubuntu20.04'] + operating-system: ['ubuntu-16.04', 'ubuntu-18.04', 'ubuntu20.04'] php-versions: ['5.3', '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1' ] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v1 - name: PHPUnit Tests - uses: php/actions/phpunit@v2 + uses: xgamer/phpunit-action@master with: command: tests/ From b281c0188698bb25a0a797898c4fe40ec5a6f334 Mon Sep 17 00:00:00 2001 From: Ronald Carter <88069959+RonaldCarter89@users.noreply.github.com> Date: Mon, 2 Aug 2021 00:46:25 +1000 Subject: [PATCH 26/27] Update php.yml --- .github/workflows/php.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index c2a6177b9..555fd7e99 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -16,10 +16,12 @@ jobs: php-versions: ['5.3', '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1' ] steps: - - uses: actions/checkout@v1 - - - name: PHPUnit Tests - uses: xgamer/phpunit-action@master - with: - command: tests/ + - name: Checkout + uses: actions/checkout@v2 + + - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + php-version: ${{ matrix.php-versions }} + From c460aa902351d2e11d6a76ab6f06f8938aec3108 Mon Sep 17 00:00:00 2001 From: Ronald Carter <88069959+RonaldCarter89@users.noreply.github.com> Date: Mon, 2 Aug 2021 00:55:50 +1000 Subject: [PATCH 27/27] Update php.yml --- .github/workflows/php.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index 555fd7e99..82bf6ee9e 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -12,7 +12,7 @@ jobs: runs-on: ${{ matrix.operating-system }} strategy: matrix: - operating-system: ['ubuntu-16.04', 'ubuntu-18.04', 'ubuntu20.04'] + operating-system: ['ubuntu-18.04', 'ubuntu20.04'] php-versions: ['5.3', '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1' ] steps: