Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jikan-me/jikan
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: aniplaylist/jikan
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
  • 6 commits
  • 4 files changed
  • 2 contributors

Commits on Apr 4, 2021

  1. Add custom vcs for goutte

    WillyReyno committed Apr 4, 2021
    Copy the full SHA
    a5fbe78 View commit details
  2. Copy the full SHA
    be0f5a2 View commit details
  3. Remove goutte repo

    Angy authored Apr 4, 2021
    Copy the full SHA
    96d3fe0 View commit details
  4. Fix goutte version

    Angy authored Apr 4, 2021
    Copy the full SHA
    a26feb7 View commit details
  5. Update composer.json

    Angy authored Apr 4, 2021
    Copy the full SHA
    602031e View commit details
  6. Update composer.json

    Angy authored Apr 4, 2021
    Copy the full SHA
    ce90769 View commit details
Showing with 11 additions and 6 deletions.
  1. +8 −3 composer.json
  2. +1 −1 src/Jikan.php
  3. +1 −1 src/MyAnimeList/MalClient.php
  4. +1 −1 src/Parser/Forum/ForumTopicParser.php
11 changes: 8 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@
}
},
"require": {
"fabpot/goutte": "^3.2",
"fabpot/goutte": "dev-master",
"php": "^7.1"
},
"require-dev": {
@@ -49,9 +49,14 @@
"composer config repositories.fixtures --unset"
]
},
"repositories": [
{
"name": "fabpot/goutte",
"type": "vcs",
"url": "git@github.com:aniplaylist/Goutte.git"
}
],
"config": {
"sort-packages": true
},
"repositories": {
}
}
2 changes: 1 addition & 1 deletion src/Jikan.php
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@

namespace Jikan;

use GuzzleHttp\Client as GuzzleClient;
use GuzzleHttp6\Client as GuzzleClient;
use Jikan\Exception\ParserException;
use Jikan\Helper\Constants;
use Jikan\Model;
2 changes: 1 addition & 1 deletion src/MyAnimeList/MalClient.php
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@

namespace Jikan\MyAnimeList;

use GuzzleHttp\Client as GuzzleClient;
use GuzzleHttp6\Client as GuzzleClient;
use Jikan\Exception\BadResponseException;
use Jikan\Exception\ParserException;
use Jikan\Goutte\GoutteWrapper;
2 changes: 1 addition & 1 deletion src/Parser/Forum/ForumTopicParser.php
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
use Jikan\Helper\Parser;
use Jikan\Model\Forum\ForumPost;
use Symfony\Component\DomCrawler\Crawler;
use function GuzzleHttp\Psr7\parse_query;
use function GuzzleHttp6\Psr7\parse_query;

/**
* Class ForumPostParser