From 7eaee77adadf1a138412455c953ab44ca00fa574 Mon Sep 17 00:00:00 2001 From: Adam Binnersley Date: Thu, 8 Oct 2020 11:51:35 +0100 Subject: [PATCH] Update Guzzle & PHPunit versions --- .scrutinizer.yml | 2 +- .travis.yml | 4 +- README.md | 1 - composer.json | 4 +- src/GoogleFonts.php | 113 +++++++++++++++++++++++--------------- tests/GoogleFontsTest.php | 34 ++++++++---- 6 files changed, 96 insertions(+), 62 deletions(-) diff --git a/.scrutinizer.yml b/.scrutinizer.yml index 115bac0..3656829 100644 --- a/.scrutinizer.yml +++ b/.scrutinizer.yml @@ -1,6 +1,6 @@ build: environment: - php: '7.1.0' + php: '7.4.0' tests: override: diff --git a/.travis.yml b/.travis.yml index b7ef300..cf0f1b3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,8 @@ language: php php: - - '7.1' - - '7.2' + - '7.3' + - '7.4' before_script: - composer self-update diff --git a/README.md b/README.md index cf2894f..773ff9f 100644 --- a/README.md +++ b/README.md @@ -63,7 +63,6 @@ You can list the available options using 1 of 3 different methods (getFontWeight ##### PHP ```php - $weights = $fonts->getFontWeights(); print_r($weights); ``` diff --git a/composer.json b/composer.json index 901032c..ff069be 100644 --- a/composer.json +++ b/composer.json @@ -3,10 +3,10 @@ "description": "Get a list of Google Fonts and search by type or weight", "type": "library", "require": { - "guzzlehttp/guzzle": "^6.3" + "guzzlehttp/guzzle": "^7.0" }, "require-dev": { - "phpunit/phpunit": "^7.0" + "phpunit/phpunit": "^9.0" }, "license": "MIT", "authors": [ diff --git a/src/GoogleFonts.php b/src/GoogleFonts.php index 6d09fb6..15cbf99 100644 --- a/src/GoogleFonts.php +++ b/src/GoogleFonts.php @@ -3,11 +3,12 @@ use GuzzleHttp\Client; -class GoogleFonts { +class GoogleFonts +{ const WEBFONTURL = 'https://www.googleapis.com/webfonts/v1/webfonts'; - CONST SORT_BY = array( + const SORT_BY = array( 'alpha', 'date', 'popularity', @@ -17,13 +18,13 @@ class GoogleFonts { /** * Google API key string - * @var string + * @var string */ private $apiKey; /** * The location where the temporary JSON file should be stored - * @var string + * @var string */ protected $file_location; @@ -35,19 +36,19 @@ class GoogleFonts { /** * This is the original font array retrieved from Google - * @var array + * @var array */ protected $fontList; /** * This is the array of fonts ordered into types - * @var array + * @var array */ protected $orderedList; /** * Error message to be displayed if no fonts exists - * @var string + * @var string */ public $error_message = 'Error: No fonts exist with the given parameters'; @@ -55,7 +56,8 @@ class GoogleFonts { * Constructor * @param string|false $apiKey This should either be set to your Google API key or left empty */ - public function __construct($apiKey = false) { + public function __construct($apiKey = false) + { $this->setAPIKey($apiKey); $this->setFontFileLocation(dirname(dirname(__FILE__)).'/fonts/'); } @@ -65,8 +67,9 @@ public function __construct($apiKey = false) { * @param string $apiKey This needs to be your Google API Key * @return $this */ - public function setApiKey($apiKey) { - if(is_string($apiKey) && !empty(trim($apiKey))) { + public function setApiKey($apiKey) + { + if (is_string($apiKey) && !empty(trim($apiKey))) { $this->apiKey = trim($apiKey); } return $this; @@ -76,8 +79,9 @@ public function setApiKey($apiKey) { * Returns the Google API key if it has been set else will return false * @return string|false This sill be the set Google API key or false */ - public function getApiKey() { - if(is_string($this->apiKey)) { + public function getApiKey() + { + if (is_string($this->apiKey)) { return $this->apiKey; } return false; @@ -88,10 +92,11 @@ public function getApiKey() { * @param string $location This should be the location that you wish to store the font list files * @return $this */ - public function setFontFileLocation($location) { - if(!empty(trim($location)) && is_string($location)) { + public function setFontFileLocation($location) + { + if (!empty(trim($location)) && is_string($location)) { $this->file_location = trim($location); - if(!is_dir($location)) { + if (!is_dir($location)) { mkdir($location, 0777, true); } } @@ -102,7 +107,8 @@ public function setFontFileLocation($location) { * This is the location where the fonts file is stored * @return string Returns the file storage location */ - public function getFontFileLocation() { + public function getFontFileLocation() + { return $this->file_location; } @@ -110,7 +116,8 @@ public function getFontFileLocation() { * Returns an array of weights available * @return array|string If any weights exist will return an array else will return the error_message */ - public function getFontWeights() { + public function getFontWeights() + { return $this->listFontTypes(); } @@ -118,7 +125,8 @@ public function getFontWeights() { * Returns an array of subsets available * @return array|string If any subsets exist will return an array else will return the error_message */ - public function getFontSubsets() { + public function getFontSubsets() + { return $this->listFontTypes('subset'); } @@ -126,7 +134,8 @@ public function getFontSubsets() { * Returns an array of types/categories available * @return array|string If any types/categories exist will return an array else will return the error_message */ - public function getFontTypes() { + public function getFontTypes() + { return $this->listFontTypes('type'); } @@ -135,9 +144,14 @@ public function getFontTypes() { * @param string $weight This should be the weight value * @return array|string */ - public function getFontsByWeight($weight) { - if($weight == '400') {$weight = 'regular';} - if($weight == '400italic') {$weight = 'italic';} + public function getFontsByWeight($weight) + { + if ($weight == '400') { + $weight = 'regular'; + } + if ($weight == '400italic') { + $weight = 'italic'; + } return $this->listFonts(strtolower($weight)); } @@ -146,7 +160,8 @@ public function getFontsByWeight($weight) { * @param string $subset This should be the subset you ant to list the fonts by * @return array|string If any fonts exists an array will be returned else the error message will be returned */ - public function getFontsBySubset($subset) { + public function getFontsBySubset($subset) + { return $this->listFonts(strtolower($subset), 'subset'); } @@ -155,7 +170,8 @@ public function getFontsBySubset($subset) { * @param string $style This should be the font type that you want to list fonts by * @return array|string If any fonts exists an array will be returned else the error message will be returned */ - public function getFontsByType($style) { + public function getFontsByType($style) + { return $this->listFonts(strtolower($style), 'type'); } @@ -165,9 +181,10 @@ public function getFontsByType($style) { * @param array $font this should be the font information array * @param string $style The main array item that you want to sort the font within e.g. weight, subset or category */ - protected function sortFontType($types, $font, $style = 'type') { - if(is_array($types)) { - foreach($types as $type) { + protected function sortFontType($types, $font, $style = 'type') + { + if (is_array($types)) { + foreach ($types as $type) { $this->orderedList[$style][$type][$font['family']] = array(($style === 'weight' ? 'file' : 'files') => ($style === 'weight' ? $font['files'][$type] : $font['files'])); } } else { @@ -178,10 +195,11 @@ protected function sortFontType($types, $font, $style = 'type') { /** * Retrieve a list of all of the fonts from Google Fonts API */ - protected function retrieveFonts() { + protected function retrieveFonts() + { $guzzle = new Client(); $fonts = $guzzle->request('GET', $this->googleFontsURI()); - if($fonts->getStatusCode() === 200) { + if ($fonts->getStatusCode() === 200) { $this->fontList = json_decode($fonts->getBody(), true); } } @@ -190,18 +208,20 @@ protected function retrieveFonts() { * The Google fonts URL will be returned with the path information * @return string */ - public function googleFontsURI() { + public function googleFontsURI() + { return self::WEBFONTURL . '?' . $this->buildQueryString(); } /** - * Builds the formatted URI path to retrieve the list of fonts from Google + * Builds the formatted URI path to retrieve the list of fonts from Google * @return string */ - protected function buildQueryString() { + protected function buildQueryString() + { $queryString = array(); $queryString['key'] = $this->getApiKey(); - if($this->sortOrder) { + if ($this->sortOrder) { $queryString['sort'] = $this->sortOrder; } return http_build_query($queryString); @@ -211,9 +231,10 @@ protected function buildQueryString() { * Retrieves the ordered Google Fonts file * @return boolean Returns true on success and false on failure */ - protected function getJSONFile() { - if(!is_array($this->orderedList)) { - if(file_exists($this->getFontFileLocation().'/fonts.json') && ((time() - filemtime($this->getFontFileLocation().'/fonts.json')) < 86400)) { + protected function getJSONFile() + { + if (!is_array($this->orderedList)) { + if (file_exists($this->getFontFileLocation().'/fonts.json') && ((time() - filemtime($this->getFontFileLocation().'/fonts.json')) < 86400)) { $this->orderedList = json_decode(file_get_contents($this->getFontFileLocation().'fonts.json'), true); return true; } @@ -225,10 +246,11 @@ protected function getJSONFile() { * Sorts all of the fonts into a custom JSON file * @return boolean If the file has successfully been created will return true else retruns false */ - protected function sortFonts() { + protected function sortFonts() + { $this->retrieveFonts(); - if(is_array($this->fontList)) { - foreach($this->fontList['items'] as $font) { + if (is_array($this->fontList)) { + foreach ($this->fontList['items'] as $font) { $this->sortFontType($font['category'], $font); $this->sortFontType($font['variants'], $font, 'weight'); $this->sortFontType($font['subsets'], $font, 'subset'); @@ -242,7 +264,8 @@ protected function sortFonts() { * Creates the temporary file containing the list of fonts * @return boolean Returns true on success false on failure */ - protected function createJSONFile() { + protected function createJSONFile() + { $fp = fopen($this->getFontFileLocation().'/fonts.json', 'w'); fwrite($fp, json_encode($this->orderedList)); return fclose($fp); @@ -253,9 +276,10 @@ protected function createJSONFile() { * @param string $list The type that you are listing * @return array|string If any types exist an array will be returned else will return the error message */ - protected function listFontTypes($list = 'weight') { + protected function listFontTypes($list = 'weight') + { $this->getJSONFile(); - if(array_key_exists($list, $this->orderedList)) { + if (array_key_exists($list, $this->orderedList)) { $array = array_keys($this->orderedList[$list]); sort($array); return $array; @@ -269,9 +293,10 @@ protected function listFontTypes($list = 'weight') { * @param string $list This needs to be the value that you are searching on * @return array|string If any fonts exist for the given parameters an array will be returned else will return the error message */ - protected function listFonts($option, $list = 'weight') { + protected function listFonts($option, $list = 'weight') + { $this->getJSONFile(); - if(array_key_exists($option, $this->orderedList[$list])) { + if (array_key_exists($option, $this->orderedList[$list])) { $array = array_keys($this->orderedList[$list][$option]); return $array; } diff --git a/tests/GoogleFontsTest.php b/tests/GoogleFontsTest.php index 429147a..d98ec74 100644 --- a/tests/GoogleFontsTest.php +++ b/tests/GoogleFontsTest.php @@ -5,7 +5,8 @@ use PHPUnit\Framework\TestCase; use Fonts\GoogleFonts; -class GoogleFontsTest extends TestCase{ +class GoogleFontsTest extends TestCase +{ protected $googleFonts; private $testAPIKey = 'fake_key'; @@ -15,11 +16,13 @@ class GoogleFontsTest extends TestCase{ * @covers Fonts\GoogleFonts::setAPIKey * @covers Fonts\GoogleFonts::setFontFileLocation */ - public function setUp() { + public function setUp(): void + { $this->googleFonts = new GoogleFonts(); } - public function tearDown() { + public function tearDown(): void + { $this->googleFonts = null; } @@ -28,7 +31,8 @@ public function tearDown() { * @covers Fonts\GoogleFonts::setApiKey * @covers Fonts\GoogleFonts::getApiKey */ - public function testAPIKey() { + public function testAPIKey() + { $this->assertFalse($this->googleFonts->getApiKey()); $this->assertObjectHasAttribute('sortOrder', $this->googleFonts->setApiKey(34534534535)); $this->assertFalse($this->googleFonts->getApiKey()); @@ -40,7 +44,8 @@ public function testAPIKey() { * @covers Fonts\GoogleFonts::setFontFileLocation * @covers Fonts\GoogleFonts::getFontFileLocation */ - public function testFileLocation() { + public function testFileLocation() + { $this->assertEquals(dirname(dirname(__FILE__)).'/fonts/', $this->googleFonts->getFontFileLocation()); $this->assertObjectHasAttribute('sortOrder', $this->googleFonts->setFontFileLocation(false)); $this->assertEquals(dirname(dirname(__FILE__)).'/fonts/', $this->googleFonts->getFontFileLocation()); @@ -60,7 +65,8 @@ public function testFileLocation() { * @covers Fonts\GoogleFonts::sortFontType * @covers Fonts\GoogleFonts::createJSONFile */ - public function testListFontWeights(){ + public function testListFontWeights() + { if (!isset($_SERVER['GOOGLE_API_KEY'])) { $this->markTestSkipped('You need to configure the GOOGLE_API_KEY value in phpunit.xml'); } @@ -79,7 +85,8 @@ public function testListFontWeights(){ * @covers Fonts\GoogleFonts::sortFontType * @covers Fonts\GoogleFonts::createJSONFile */ - public function testListFontByWeight(){ + public function testListFontByWeight() + { if (!isset($_SERVER['GOOGLE_API_KEY'])) { $this->markTestSkipped('You need to configure the GOOGLE_API_KEY value in phpunit.xml'); } @@ -98,7 +105,8 @@ public function testListFontByWeight(){ * @covers Fonts\GoogleFonts::sortFontType * @covers Fonts\GoogleFonts::createJSONFile */ - public function testListFontSubsets(){ + public function testListFontSubsets() + { if (!isset($_SERVER['GOOGLE_API_KEY'])) { $this->markTestSkipped('You need to configure the GOOGLE_API_KEY value in phpunit.xml'); } @@ -116,7 +124,8 @@ public function testListFontSubsets(){ * @covers Fonts\GoogleFonts::sortFontType * @covers Fonts\GoogleFonts::createJSONFile */ - public function testListFontBySubset(){ + public function testListFontBySubset() + { if (!isset($_SERVER['GOOGLE_API_KEY'])) { $this->markTestSkipped('You need to configure the GOOGLE_API_KEY value in phpunit.xml'); } @@ -135,7 +144,8 @@ public function testListFontBySubset(){ * @covers Fonts\GoogleFonts::sortFontType * @covers Fonts\GoogleFonts::createJSONFile */ - public function testListFontTypes(){ + public function testListFontTypes() + { if (!isset($_SERVER['GOOGLE_API_KEY'])) { $this->markTestSkipped('You need to configure the GOOGLE_API_KEY value in phpunit.xml'); } @@ -154,7 +164,8 @@ public function testListFontTypes(){ * @covers Fonts\GoogleFonts::sortFontType * @covers Fonts\GoogleFonts::createJSONFile */ - public function testListFontByTypes(){ + public function testListFontByTypes() + { if (!isset($_SERVER['GOOGLE_API_KEY'])) { $this->markTestSkipped('You need to configure the GOOGLE_API_KEY value in phpunit.xml'); } @@ -162,5 +173,4 @@ public function testListFontByTypes(){ $this->assertEquals('Lobster', $this->googleFonts->getFontsByType('display')[0]); $this->assertContains('Error', $this->googleFonts->getFontsByType(457544)); } - }