jonny/jonnybarnes.uk
1
0
Fork 0
Code Issues 8 Pull requests Projects Releases 5 Packages Wiki Activity Actions

Struct Types

Browse source 
Squashed commit of the following:

commit 74ed84617fcbecf661695763323e50d049a88db7
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Mon Jan 15 12:46:29 2018 +0000

    Test passes so remove the dump statement

commit a7d3323be02da64f76e8ec88713e3de84a13ded7
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Mon Jan 15 12:40:35 2018 +0000

    Values with spaces need to be quoted

commit 58a120bb238f14346793c388b948b7351d3b51fd
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Mon Jan 15 12:37:23 2018 +0000

    We need a diplay name for the tests to work now we are using strict type checking

commit b46f177053bd697db9a4835d073f2f37e088b26f
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Mon Jan 15 12:31:29 2018 +0000

    Get travis to show more info about failing test

commit 60323f3ce5a0561329a1721ee94821571cdcc86a
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Mon Jan 15 12:23:27 2018 +0000

    Remove un-used namnepsace imports

commit 096d3505920bc94ff8677c77430eca0aae0be58a
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Mon Jan 15 12:21:55 2018 +0000

    we need php7.2 for object type-hint

commit bb818bc19c73d02d510af9f002199f5718a54608
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Mon Jan 15 12:15:48 2018 +0000

    Added lots of strict_types
This commit is contained in:
Jonny Barnes 2018-01-15 14:02:13 +00:00
parent 053e19a457
commit e4fe2ecde3
64 changed files with 911 additions and 406 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/Jobs/AddClientToDatabase.php
View file

@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
namespace App\Jobs;
use Illuminate\Bus\Queueable;
@ -18,7 +20,7 @@ class AddClientToDatabase implements ShouldQueue
/**
* Create a new job instance.
*
* @return void
* @param string $client_id
*/
public function __construct(string $client_id)
{

9
app/Jobs/DownloadWebMention.php
View file

@ -1,9 +1,12 @@
<?php
declare(strict_types=1);
namespace App\Jobs;
use GuzzleHttp\Client;
use Illuminate\Bus\Queueable;
use Illuminate\FileSystem\FileSystem;
use Illuminate\Queue\SerializesModels;
use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Contracts\Queue\ShouldQueue;
@ -22,7 +25,7 @@ class DownloadWebMention implements ShouldQueue
/**
* Create a new job instance.
*
* @return void
* @param string $source
*/
public function __construct(string $source)
{
@ -32,7 +35,7 @@ class DownloadWebMention implements ShouldQueue
/**
* Execute the job.
*
* @return void
* @param \GuzzleHttp\Client $guzzle
*/
public function handle(Client $guzzle)
{
@ -40,7 +43,7 @@ class DownloadWebMention implements ShouldQueue
//4XX and 5XX responses should get Guzzle to throw an exception,
//Laravel should catch and retry these automatically.
if ($response->getStatusCode() == '200') {
$filesystem = new \Illuminate\FileSystem\FileSystem();
$filesystem = new FileSystem();
$filename = storage_path('HTML') . '/' . $this->createFilenameFromURL($this->source);
//backup file first
$filenameBackup = $filename . '.' . date('Y-m-d') . '.backup';

4
app/Jobs/ProcessBookmark.php
View file

@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
namespace App\Jobs;
use App\Models\Bookmark;
@ -20,7 +22,7 @@ class ProcessBookmark implements ShouldQueue
/**
* Create a new job instance.
*
* @return void
* @param \App\Models\Bookmark $bookmark
*/
public function __construct(Bookmark $bookmark)
{

18
app/Jobs/ProcessLike.php
View file

@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
namespace App\Jobs;
use App\Models\Like;
@ -23,7 +25,7 @@ class ProcessLike implements ShouldQueue
/**
* Create a new job instance.
*
* @return void
* @param \App\Models\Like $like
*/
public function __construct(Like $like)
{
@ -33,9 +35,11 @@ class ProcessLike implements ShouldQueue
/**
* Execute the job.
*
* @return void
* @param \GuzzleHttp\Client $client
* @param \Jonnybarnes\WebmentionsParser\Authorship $authorship
* @return int
*/
public function handle(Client $client, Authorship $authorship)
public function handle(Client $client, Authorship $authorship): int
{
if ($this->isTweet($this->like->url)) {
$tweet = Twitter::getOembed(['url' => $this->like->url]);
@ -83,8 +87,16 @@ class ProcessLike implements ShouldQueue
}
$this->like->save();
return 0;
}
/**
* Determine if a given URL is that of a Tweet.
*
* @param string $url
* @return bool
*/
private function isTweet(string $url): bool
{
$host = parse_url($url, PHP_URL_HOST);

6
app/Jobs/ProcessMedia.php
View file

@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
namespace App\Jobs;
use Illuminate\Bus\Queueable;
@ -20,7 +22,7 @@ class ProcessMedia implements ShouldQueue
/**
* Create a new job instance.
*
* @return void
* @param string $filename
*/
public function __construct(string $filename)
{
@ -30,7 +32,7 @@ class ProcessMedia implements ShouldQueue
/**
* Execute the job.
*
* @return void
* @param \Intervention\Image\ImageManager $manager
*/
public function handle(ImageManager $manager)
{

9
app/Jobs/ProcessWebMention.php
View file

@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
namespace App\Jobs;
use Mf2;
@ -22,9 +24,8 @@ class ProcessWebMention implements ShouldQueue
/**
* Create a new job instance.
*
* @param \App\Note $note
* @param string $source
* @return void
* @param \App\Note $note
* @param string $source
*/
public function __construct(Note $note, $source)
{
@ -37,7 +38,6 @@ class ProcessWebMention implements ShouldQueue
*
* @param \Jonnybarnes\WebmentionsParser\Parser $parser
* @param \GuzzleHttp\Client $guzzle
* @return void
*/
public function handle(Parser $parser, Client $guzzle)
{
@ -102,7 +102,6 @@ class ProcessWebMention implements ShouldQueue
*
* @param string $html
* @param string $url
* @return string|null
*/
private function saveRemoteContent($html, $url)
{

8
app/Jobs/SaveProfileImage.php
View file

@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
namespace App\Jobs;
use GuzzleHttp\Client;
@ -20,9 +22,9 @@ class SaveProfileImage implements ShouldQueue
/**
* Create a new job instance.
*
* @return void
* @param array $microformats
*/
public function __construct($microformats)
public function __construct(array $microformats)
{
$this->microformats = $microformats;
}
@ -30,7 +32,7 @@ class SaveProfileImage implements ShouldQueue
/**
* Execute the job.
*
* @return void
* @param \Jonnybarnes\WebmentionsParser\Authorship $authorship
*/
public function handle(Authorship $authorship)
{

23
app/Jobs/SendWebMentions.php
View file

@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
namespace App\Jobs;
use App\Models\Note;
@ -18,8 +20,7 @@ class SendWebMentions implements ShouldQueue
/**
* Create the job instance, inject dependencies.
*
* @param Note $note
* @return void
* @param Note $note
*/
public function __construct(Note $note)
{
@ -34,7 +35,9 @@ class SendWebMentions implements ShouldQueue
public function handle()
{
//grab the URLs
$urlsInReplyTo = explode(' ', $this->note->in_reply_to);
$inReplyTo = $this->note->in_reply_to ?? '';
// above so explode doesn’t complain about null being passed in
$urlsInReplyTo = explode(' ', $inReplyTo);
$urlsNote = $this->getLinks($this->note->note);
$urls = array_filter(array_merge($urlsInReplyTo, $urlsNote)); //filter out none URLs
foreach ($urls as $url) {
@ -54,10 +57,10 @@ class SendWebMentions implements ShouldQueue
/**
* Discover if a URL has a webmention endpoint.
*
* @param string The URL
* @return string The webmention endpoint URL
* @param string $url
* @return string|null
*/
public function discoverWebmentionEndpoint($url)
public function discoverWebmentionEndpoint(string $url)
{
//let’s not send webmentions to myself
if (parse_url($url, PHP_URL_HOST) == config('app.longurl')) {
@ -97,8 +100,8 @@ class SendWebMentions implements ShouldQueue
/**
* Get the URLs from a note.
*
* @param string $html
* @return array $urls
* @param string $html
* @return array $urls
*/
public function getLinks($html)
{
@ -119,8 +122,8 @@ class SendWebMentions implements ShouldQueue
/**
* Resolve a URI if necessary.
*
* @param string $url
* @param string $base
* @param string $url
* @param string $base The base of the URL
* @return string
*/
public function resolveUri(string $url, string $base): string

6
app/Jobs/SyndicateBookmarkToFacebook.php
View file

@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
namespace App\Jobs;
use GuzzleHttp\Client;
@ -19,7 +21,7 @@ class SyndicateBookmarkToFacebook implements ShouldQueue
/**
* Create a new job instance.
*
* @return void
* @param \App\Models\Bookmark $bookmark
*/
public function __construct(Bookmark $bookmark)
{
@ -29,7 +31,7 @@ class SyndicateBookmarkToFacebook implements ShouldQueue
/**
* Execute the job.
*
* @return void
* @param \GuzzleHttp\Client $guzzle
*/
public function handle(Client $guzzle)
{

6
app/Jobs/SyndicateBookmarkToTwitter.php
View file

@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
namespace App\Jobs;
use GuzzleHttp\Client;
@ -19,7 +21,7 @@ class SyndicateBookmarkToTwitter implements ShouldQueue
/**
* Create a new job instance.
*
* @return void
* @param \App\Models\Bookmark $bookmark
*/
public function __construct(Bookmark $bookmark)
{
@ -29,7 +31,7 @@ class SyndicateBookmarkToTwitter implements ShouldQueue
/**
* Execute the job.
*
* @return void
* @param \GuzzleHttp\Client $guzzle
*/
public function handle(Client $guzzle)
{

6
app/Jobs/SyndicateNoteToFacebook.php
View file

@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
namespace App\Jobs;
use App\Models\Note;
@ -18,7 +20,7 @@ class SyndicateNoteToFacebook implements ShouldQueue
/**
* Create a new job instance.
*
* @return void
* @param \App\Models\Note $note
*/
public function __construct(Note $note)
{
@ -28,7 +30,7 @@ class SyndicateNoteToFacebook implements ShouldQueue
/**
* Execute the job.
*
* @return void
* @param \GuzzleHttp\Client $guzzle
*/
public function handle(Client $guzzle)
{

7
app/Jobs/SyndicateNoteToTwitter.php
View file

@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
namespace App\Jobs;
use App\Models\Note;
@ -18,7 +20,7 @@ class SyndicateNoteToTwitter implements ShouldQueue
/**
* Create a new job instance.
*
* @return void
* @param \App\Models\Note $note
*/
public function __construct(Note $note)
{
@ -28,8 +30,7 @@ class SyndicateNoteToTwitter implements ShouldQueue
/**
* Execute the job.
*
* @param \GuzzleHttp\Client $guzzle
* @return void
* @param \GuzzleHttp\Client $guzzle
*/
public function handle(Client $guzzle)
{