From 08118c5cde00230b200a251e0eeb42215d4987fa Mon Sep 17 00:00:00 2001 From: John Paul Medina Date: Tue, 23 Jun 2020 11:15:17 -0500 Subject: [PATCH 1/2] Testing for Laravel 7.x support --- README.md | 24 ++++++++++++------------ composer.json | 15 ++++++++++----- 2 files changed, 22 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 05d2e45..0377fd0 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ Laravel-USPS is a composer package that allows you to integrate the USPS Address / Shipping API. This package is ported from @author Vincent Gabriel https://github.com/VinceG/USPS-php-api - Requires a valid USPS API Username - - Tested on Laravel 6 + - Tested on Laravel 7 ## Installation @@ -44,11 +44,11 @@ The only method completed for Laravel is the `Usps::validate` which is defined i ```php = 5.4 configured with the following extensions: +- PHP >= 7.2.5 configured with the following extensions: - cURL - USPS API Username @@ -111,9 +117,3 @@ Requirements Authors ======= - Vincent Gabriel (Original PHP-Wrapper) - -Contributors -============ -@pdbreen -@bredmor -@scs-ben diff --git a/composer.json b/composer.json index 67b000f..6abe3de 100644 --- a/composer.json +++ b/composer.json @@ -1,12 +1,17 @@ { "name": "johnpaulmedina/laravel-usps", - "description": "USPS API for Laravel 6", + "description": "USPS API for Laravel 7", "type": "library", - "keywords": ["usps","laravel","laravel6","laravel usps"], + "keywords": [ + "usps", + "laravel", + "laravel7", + "laravel usps" + ], "authors": [ { "name": "John Paul Medina", - "email": "medina.jpaul@gmail.com" + "email": "jp@leadtrust.io" }, { "name": "Vincent Gabriel", @@ -16,8 +21,8 @@ "homepage":"https://github.com/johnpaulmedina/laravel-usps/", "license": "MIT", "require": { - "php": "^7.2", - "illuminate/support": "^6.0" + "php": "^7.2.5", + "illuminate/support": "^7.0" }, "autoload": { "psr-4": { From 987ded701f621070c2d1b5f749ad59d88c0e958b Mon Sep 17 00:00:00 2001 From: John Paul Medina Date: Tue, 23 Jun 2020 11:33:01 -0500 Subject: [PATCH 2/2] PSR-4 folder structure --- src/.DS_Store | Bin 6148 -> 6148 bytes src/{Usps => }/Address.php | 0 src/{Usps => }/AddressVerify.php | 0 src/{Usps => }/CityStateLookup.php | 0 src/{Usps => }/Exceptions/UspsException.php | 0 .../Exceptions/UspsTrackConfirmException.php | 0 src/{Usps => }/Facades/Usps.php | 0 src/{Usps => }/FirstClassServiceStandards.php | 0 src/{Usps => }/InternationalLabel.php | 0 src/{Usps => }/OpenDistributeLabel.php | 0 src/{Usps => }/PriorityLabel.php | 0 .../PriorityMailServiceStandards.php | 0 src/{Usps => }/Rate.php | 0 src/{Usps => }/RatePackage.php | 0 src/{Usps => }/ServiceDeliveryCalculator.php | 0 src/{Usps => }/TrackConfirm.php | 0 src/{Usps => }/USPSBase.php | 0 src/{Usps => }/Usps.php | 0 src/Usps/.DS_Store | Bin 6148 -> 0 bytes src/{Usps => }/UspsServiceProvider.php | 0 src/{Usps => }/XML2Array.php | 0 src/{Usps => }/XMLParser.php | 0 src/{Usps => }/ZipCodeLookup.php | 0 23 files changed, 0 insertions(+), 0 deletions(-) rename src/{Usps => }/Address.php (100%) rename src/{Usps => }/AddressVerify.php (100%) rename src/{Usps => }/CityStateLookup.php (100%) rename src/{Usps => }/Exceptions/UspsException.php (100%) rename src/{Usps => }/Exceptions/UspsTrackConfirmException.php (100%) rename src/{Usps => }/Facades/Usps.php (100%) rename src/{Usps => }/FirstClassServiceStandards.php (100%) rename src/{Usps => }/InternationalLabel.php (100%) rename src/{Usps => }/OpenDistributeLabel.php (100%) rename src/{Usps => }/PriorityLabel.php (100%) rename src/{Usps => }/PriorityMailServiceStandards.php (100%) rename src/{Usps => }/Rate.php (100%) rename src/{Usps => }/RatePackage.php (100%) rename src/{Usps => }/ServiceDeliveryCalculator.php (100%) rename src/{Usps => }/TrackConfirm.php (100%) rename src/{Usps => }/USPSBase.php (100%) rename src/{Usps => }/Usps.php (100%) delete mode 100644 src/Usps/.DS_Store rename src/{Usps => }/UspsServiceProvider.php (100%) rename src/{Usps => }/XML2Array.php (100%) rename src/{Usps => }/XMLParser.php (100%) rename src/{Usps => }/ZipCodeLookup.php (100%) diff --git a/src/.DS_Store b/src/.DS_Store index 0a60c23c6fe66485cac954c7af8110153801a035..6515d6d0e4fa582d10a45b0dfdd8e6fb312d677c 100644 GIT binary patch delta 70 zcmZoMXfc@JFUrQiz`)4BAi%(o!jQ^PoKl>elaxO(ak&ggf}O#QA(0^&h>;}oa~L-B NFg{@0%+B$b9{?rC5mo>I delta 43 zcmZoMXfc@JFUZQkz`)4BAi$7PoSc)CpPw^%BjajD*3IgS57;I)NN;B6_{$Ff^hpeI diff --git a/src/Usps/Address.php b/src/Address.php similarity index 100% rename from src/Usps/Address.php rename to src/Address.php diff --git a/src/Usps/AddressVerify.php b/src/AddressVerify.php similarity index 100% rename from src/Usps/AddressVerify.php rename to src/AddressVerify.php diff --git a/src/Usps/CityStateLookup.php b/src/CityStateLookup.php similarity index 100% rename from src/Usps/CityStateLookup.php rename to src/CityStateLookup.php diff --git a/src/Usps/Exceptions/UspsException.php b/src/Exceptions/UspsException.php similarity index 100% rename from src/Usps/Exceptions/UspsException.php rename to src/Exceptions/UspsException.php diff --git a/src/Usps/Exceptions/UspsTrackConfirmException.php b/src/Exceptions/UspsTrackConfirmException.php similarity index 100% rename from src/Usps/Exceptions/UspsTrackConfirmException.php rename to src/Exceptions/UspsTrackConfirmException.php diff --git a/src/Usps/Facades/Usps.php b/src/Facades/Usps.php similarity index 100% rename from src/Usps/Facades/Usps.php rename to src/Facades/Usps.php diff --git a/src/Usps/FirstClassServiceStandards.php b/src/FirstClassServiceStandards.php similarity index 100% rename from src/Usps/FirstClassServiceStandards.php rename to src/FirstClassServiceStandards.php diff --git a/src/Usps/InternationalLabel.php b/src/InternationalLabel.php similarity index 100% rename from src/Usps/InternationalLabel.php rename to src/InternationalLabel.php diff --git a/src/Usps/OpenDistributeLabel.php b/src/OpenDistributeLabel.php similarity index 100% rename from src/Usps/OpenDistributeLabel.php rename to src/OpenDistributeLabel.php diff --git a/src/Usps/PriorityLabel.php b/src/PriorityLabel.php similarity index 100% rename from src/Usps/PriorityLabel.php rename to src/PriorityLabel.php diff --git a/src/Usps/PriorityMailServiceStandards.php b/src/PriorityMailServiceStandards.php similarity index 100% rename from src/Usps/PriorityMailServiceStandards.php rename to src/PriorityMailServiceStandards.php diff --git a/src/Usps/Rate.php b/src/Rate.php similarity index 100% rename from src/Usps/Rate.php rename to src/Rate.php diff --git a/src/Usps/RatePackage.php b/src/RatePackage.php similarity index 100% rename from src/Usps/RatePackage.php rename to src/RatePackage.php diff --git a/src/Usps/ServiceDeliveryCalculator.php b/src/ServiceDeliveryCalculator.php similarity index 100% rename from src/Usps/ServiceDeliveryCalculator.php rename to src/ServiceDeliveryCalculator.php diff --git a/src/Usps/TrackConfirm.php b/src/TrackConfirm.php similarity index 100% rename from src/Usps/TrackConfirm.php rename to src/TrackConfirm.php diff --git a/src/Usps/USPSBase.php b/src/USPSBase.php similarity index 100% rename from src/Usps/USPSBase.php rename to src/USPSBase.php diff --git a/src/Usps/Usps.php b/src/Usps.php similarity index 100% rename from src/Usps/Usps.php rename to src/Usps.php diff --git a/src/Usps/.DS_Store b/src/Usps/.DS_Store deleted file mode 100644 index 923490b6278f19f2cdb89262bb74d95e56035a28..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKISv9b4733WBpOP}e1RWC2>1XW;8;2&3PisZ@8W5Uj{>yNK>->|&LoZ}QKne0 zMMUS9W+pNbkrCWbt~PYd_RTxi%ZLKuIHQq+oSXChxI1;SUk8jkl$C5{4}ajFjx11Z?40ESo@Nx|Fa*TzQj$ WYhoMdbi|zw