Skip to content

Commit

Permalink
minor symfony#32800 Improve some URLs (Arman-Hosseini)
Browse files Browse the repository at this point in the history
This PR was squashed before being merged into the 3.4 branch (closes symfony#32800).

Discussion
----------

Improve some URLs

| Q             | A
| ------------- | ---
| Branch?       | 3.4 <!-- see below -->
| Bug fix?      | no
| New feature?  | no <!-- please update src/**/CHANGELOG.md files -->
| BC breaks?    | no     <!-- see https://symfony.com/bc -->
| Deprecations? | no <!-- please update UPGRADE-*.md and src/**/CHANGELOG.md files -->
| Tests pass?   | yes    <!-- please add some, will be required by reviewers -->
| Fixed tickets | N/A   <!-- #-prefixed issue number(s), if any -->
| License       | MIT
| Doc PR        | N/A <!-- required for new features -->

<!--
Replace this notice by a short README for your feature/bugfix. This will help people
understand your PR and can be used as a start for the documentation.

Additionally (see https://symfony.com/roadmap):
 - Bug fixes must be submitted against the lowest maintained branch where they apply
   (lowest branches are regularly merged to upper ones so they get the fixes too).
 - Features and deprecations must be submitted against branch 4.4.
 - Legacy code removals go to the master branch.
-->

Commits
-------

fab17a4 Improve some URLs
  • Loading branch information
nicolas-grekas committed Aug 8, 2019
2 parents 3065926 + f520e3e commit 07e40e1
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Encoder/JsonDecode.php
Expand Up @@ -62,7 +62,7 @@ public function __construct($associative = false, $depth = 512)
*
* @throws NotEncodableValueException
*
* @see http://php.net/json_decode json_decode
* @see https://php.net/json_decode
*/
public function decode($data, $format, array $context = [])
{
Expand Down
2 changes: 1 addition & 1 deletion Normalizer/DateTimeNormalizer.php
Expand Up @@ -90,7 +90,7 @@ public function denormalize($data, $class, $format = null, array $context = [])

if (null !== $dateTimeFormat) {
if (null === $timezone && \PHP_VERSION_ID < 70000) {
// https://bugs.php.net/bug.php?id=68669
// https://bugs.php.net/68669
$object = \DateTime::class === $class ? \DateTime::createFromFormat($dateTimeFormat, $data) : \DateTimeImmutable::createFromFormat($dateTimeFormat, $data);
} else {
$object = \DateTime::class === $class ? \DateTime::createFromFormat($dateTimeFormat, $data, $timezone) : \DateTimeImmutable::createFromFormat($dateTimeFormat, $data, $timezone);
Expand Down

0 comments on commit 07e40e1

Please sign in to comment.