From a266bbc0a488af90e85e915113cd355115a5a6bd Mon Sep 17 00:00:00 2001 From: Ross Cooper Date: Tue, 7 Jan 2020 08:44:01 +0000 Subject: [PATCH 1/4] Updated version and readme file for updated HubSpot dependency --- README.md | 4 ++-- VERSION.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index d206de5..899a6cf 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![Latest Stable Version](https://poser.pugx.org/rossjcooper/laravel-hubspot/v/stable)](https://packagist.org/packages/rossjcooper/laravel-hubspot) [![Total Downloads](https://poser.pugx.org/rossjcooper/laravel-hubspot/downloads)](https://packagist.org/packages/rossjcooper/laravel-hubspot) [![Build Status](https://travis-ci.org/rossjcooper/laravel-hubspot.svg?branch=master)](https://travis-ci.org/rossjcooper/laravel-hubspot) -This is a wrapper for the [ryanwinchester/hubspot-php](https://github.com/ryanwinchester/hubspot-php) package and gives the user a Service Container binding and facade of the `SevenShores\Hubspot\Factory::create('api-key')` function. +This is a wrapper for the [hubspot/hubspot-php](https://github.com/HubSpot/hubspot-php) package and gives the user a Service Container binding and facade of the `SevenShores\Hubspot\Factory::create('api-key')` function. ## Installation 1. `composer require rossjcooper/laravel-hubspot` @@ -41,7 +41,7 @@ Route::get('/', function (Rossjcooper\LaravelHubSpot\HubSpot $hubspot) { }); ``` -For more info on using the actual API see the main repo [ryanwinchester/hubspot-php](https://github.com/ryanwinchester/hubspot-php) +For more info on using the actual API see the main repo [hubspot/hubspot-php](https://github.com/HubSpot/hubspot-php) ## Testing diff --git a/VERSION.txt b/VERSION.txt index 589268e..359a5b9 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -1.3.0 \ No newline at end of file +2.0.0 \ No newline at end of file From 51d8a516429926aae21a216119a463e45934ef1e Mon Sep 17 00:00:00 2001 From: Ross Cooper Date: Tue, 7 Jan 2020 08:44:15 +0000 Subject: [PATCH 2/4] Added a changelog --- CHANGELOG.md | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..f735cad --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,18 @@ +# Changelog +All notable changes to this project will be documented in this file. + +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). + +## [Unreleased] + +## [2.0.0] - 2020-01-07 + +- Updated HubSpot base package to official package. [#19] + + + +[Unreleased]:https://github.com/rossjcooper/laravel-hubspot/compare/v2.0.0...HEAD +[2.0.0]:https://github.com/rossjcooper/laravel-hubspot/compare/v2.0.0...1.3.0 + +[#19]: https://github.com/rossjcooper/laravel-hubspot/pull/19 \ No newline at end of file From 58db56a720a1a82bef9dd2e70dd304683ef31651 Mon Sep 17 00:00:00 2001 From: Ross Cooper Date: Tue, 7 Jan 2020 08:44:34 +0000 Subject: [PATCH 3/4] Fixed unit tests for new hubspot package --- tests/Unit/ServiceProviderTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Unit/ServiceProviderTest.php b/tests/Unit/ServiceProviderTest.php index 040572b..87c6430 100644 --- a/tests/Unit/ServiceProviderTest.php +++ b/tests/Unit/ServiceProviderTest.php @@ -18,6 +18,6 @@ public function test_api_key_set() { $hubspot = app(HubSpot::class); - $this->assertEquals(env('HUBSPOT_API_KEY'), $hubspot->client->key); + $this->assertEquals(env('HUBSPOT_API_KEY'), $hubspot->getClient()->key); } } From bad7f3571a50f8bc14561739e7af96169dc30a59 Mon Sep 17 00:00:00 2001 From: Ross Cooper Date: Tue, 7 Jan 2020 08:44:59 +0000 Subject: [PATCH 4/4] PHP CS fix --- tests/API/ContactsTest.php | 2 +- tests/Unit/ServiceProviderTest.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/API/ContactsTest.php b/tests/API/ContactsTest.php index 01c80ab..65e645f 100644 --- a/tests/API/ContactsTest.php +++ b/tests/API/ContactsTest.php @@ -2,8 +2,8 @@ namespace Tests\API; -use Tests\TestCase; use Rossjcooper\LaravelHubSpot\HubSpot; +use Tests\TestCase; class ContactsTest extends TestCase { diff --git a/tests/Unit/ServiceProviderTest.php b/tests/Unit/ServiceProviderTest.php index 87c6430..e14fe94 100644 --- a/tests/Unit/ServiceProviderTest.php +++ b/tests/Unit/ServiceProviderTest.php @@ -2,8 +2,8 @@ namespace Tests\Unit; -use Tests\TestCase; use Rossjcooper\LaravelHubSpot\HubSpot; +use Tests\TestCase; class ServiceProviderTest extends TestCase {