Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitc311f5f

Browse files
committed
Merge branch '3.4' into 4.0
* 3.4: (23 commits) Use "setAttribute" method Use the proper path of version 2.x Added some minor explanation about 308 code Use 308 to ensure http method is preserved Mentioned the new FirewallConfig class Fixed a minor error in form collections example fix(Extractor): ExtractorInterface called Mention that argon2i doesn't need a salt either Update finder.rst Fix "RequestExceptionInterface" link ...
2 parents2e76707 +7455557 commitc311f5f

File tree

48 files changed

+139
-115
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+139
-115
lines changed

‎best_practices/business-logic.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -275,6 +275,6 @@ Next: :doc:`/best_practices/controllers`
275275
.. _`full definition`:https://en.wikipedia.org/wiki/Business_logic
276276
.. _`Doctrine project`:http://www.doctrine-project.org/
277277
.. _`fixture class`:https://symfony.com/doc/current/bundles/DoctrineFixturesBundle/index.html#writing-simple-fixtures
278-
.. _`PSR-1`:http://www.php-fig.org/psr/psr-1/
279-
.. _`PSR-2`:http://www.php-fig.org/psr/psr-2/
278+
.. _`PSR-1`:https://www.php-fig.org/psr/psr-1/
279+
.. _`PSR-2`:https://www.php-fig.org/psr/psr-2/
280280
.. _`PHP-CS-Fixer`:https://github.com/FriendsOfPHP/PHP-CS-Fixer

‎bundles/best_practices.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -546,11 +546,11 @@ Learn more
546546
*:doc:`/bundles/extension`
547547
*:doc:`/bundles/configuration`
548548

549-
.. _`PSR-4`:http://www.php-fig.org/psr/psr-4/
549+
.. _`PSR-4`:https://www.php-fig.org/psr/psr-4/
550550
.. _`Symfony Flex recipe`:https://github.com/symfony/recipes
551-
.. _`Semantic Versioning Standard`:http://semver.org/
551+
.. _`Semantic Versioning Standard`:https://semver.org/
552552
.. _`Packagist`:https://packagist.org/
553-
.. _`choose any license`:http://choosealicense.com/
553+
.. _`choose any license`:https://choosealicense.com/
554554
.. _`valid license identifier`:https://spdx.org/licenses/
555555
.. _`Travis CI`:https://travis-ci.org/
556556
.. _`Travis Cron`:https://docs.travis-ci.com/user/cron-jobs/

‎components/console/logger.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,4 +111,4 @@ soon as any error message has been logged during the execution of the command.
111111
This is useful to decide which status code to return as the result of executing
112112
the command.
113113

114-
.. _PSR-3:http://www.php-fig.org/psr/psr-3/
114+
.. _PSR-3:https://www.php-fig.org/psr/psr-3/

‎components/event_dispatcher.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -513,6 +513,6 @@ Learn More
513513
*:ref:`The kernel.event_subscriber tag<dic-tags-kernel-event-subscriber>`
514514

515515
.. _Mediator:https://en.wikipedia.org/wiki/Mediator_pattern
516-
.. _Closures:http://php.net/manual/en/functions.anonymous.php
517-
.. _PHP callable:http://www.php.net/manual/en/language.pseudo-types.php#language.types.callback
516+
.. _Closures:https://php.net/manual/en/functions.anonymous.php
517+
.. _PHP callable:https://php.net/manual/en/language.pseudo-types.php#language.types.callback
518518
.. _Packagist:https://packagist.org/packages/symfony/event-dispatcher

‎components/finder.rst‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,10 @@ It's also possible to ignore directories that you don't have permission to read:
115115
As the Finder uses PHP iterators, you can pass any URL with a supported
116116
`protocol`_::
117117

118+
// always add a trailing slash when looking for in the FTP root dir
119+
$finder->in('ftp://example.com/');
120+
121+
// you can also look for in a FTP directory
118122
$finder->in('ftp://example.com/pub/');
119123

120124
And it also works with user-defined streams::
@@ -318,8 +322,8 @@ The contents of returned files can be read with
318322
// ...
319323
}
320324

321-
.. _strtotime:http://www.php.net/manual/en/datetime.formats.php
322-
.. _protocol:http://www.php.net/manual/en/wrappers.php
323-
.. _Streams:http://www.php.net/streams
324-
.. _IEC standard:http://physics.nist.gov/cuu/Units/binary.html
325+
.. _strtotime:https://php.net/manual/en/datetime.formats.php
326+
.. _protocol:https://php.net/manual/en/wrappers.php
327+
.. _Streams:https://php.net/streams
328+
.. _IEC standard:https://physics.nist.gov/cuu/Units/binary.html
325329
.. _Packagist:https://packagist.org/packages/symfony/finder

‎components/http_foundation/session_configuration.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,6 @@ particular cookie by reading the ``getLifetime()`` method::
261261
The expiry time of the cookie can be determined by adding the created
262262
timestamp and the lifetime.
263263

264-
.. _`php.net/session.customhandler`:http://php.net/session.customhandler
265-
.. _`php.net/session.configuration`:http://php.net/session.configuration
266-
.. _`php.net/memcached.setoption`:http://php.net/memcached.setoption
264+
.. _`php.net/session.customhandler`:https://php.net/session.customhandler
265+
.. _`php.net/session.configuration`:https://php.net/session.configuration
266+
.. _`php.net/memcached.setoption`:https://php.net/memcached.setoption

‎components/http_kernel.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -561,7 +561,7 @@ below for more details).
561561
:class:`Symfony\\Component\\HttpKernel\\Exception\\HttpException` class.
562562

563563
3) If the original exception implements
564-
:class:`Symfony\\Component\\HttpKernel\\Exception\\RequestExceptionInterface`,
564+
:class:`Symfony\\Component\\HttpFoundation\\Exception\\RequestExceptionInterface`,
565565
then the status code of the ``FlattenException`` object is populated with
566566
``400`` and no other headers are modified.
567567

@@ -749,10 +749,10 @@ Learn more
749749
/reference/events
750750

751751
.. _Packagist:https://packagist.org/packages/symfony/http-kernel
752-
.. _reflection:http://php.net/manual/en/book.reflection.php
752+
.. _reflection:https://php.net/manual/en/book.reflection.php
753753
.. _FOSRestBundle:https://github.com/friendsofsymfony/FOSRestBundle
754754
.. _`Create your own framework... on top of the Symfony2 Components`:http://fabien.potencier.org/article/50/create-your-own-framework-on-top-of-the-symfony2-components-part-1
755-
.. _`PHP FPM`:http://php.net/manual/en/install.fpm.php
755+
.. _`PHP FPM`:https://php.net/manual/en/install.fpm.php
756756
.. _`SensioFrameworkExtraBundle`:https://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/index.html
757757
.. _`@ParamConverter`:https://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/annotations/converters.html
758758
.. _`@Template`:https://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/annotations/view.html

‎components/intl.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -347,6 +347,6 @@ Learn more
347347

348348
.. _Packagist:https://packagist.org/packages/symfony/intl
349349
.. _Icu component:https://packagist.org/packages/symfony/icu
350-
.. _intl extension:http://www.php.net/manual/en/book.intl.php
351-
.. _install the intl extension:http://www.php.net/manual/en/intl.setup.php
350+
.. _intl extension:https://php.net/manual/en/book.intl.php
351+
.. _install the intl extension:https://php.net/manual/en/intl.setup.php
352352
.. _ICU library:http://site.icu-project.org/

‎components/ldap.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ delete existing ones::
126126
$query = $ldap->query('dc=symfony,dc=com', '(&(objectclass=person)(ou=Maintainers))');
127127
$result = $query->execute();
128128
$entry = $result[0];
129-
$entry->addAttribute('email', array('fabpot@symfony.com'));
129+
$entry->setAttribute('email', array('fabpot@symfony.com'));
130130
$em->update($entry);
131131

132132
// Removing an existing entry

‎components/phpunit_bridge.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -572,11 +572,11 @@ not find the SUT:
572572
.. _PHPUnit:https://phpunit.de
573573
.. _`PHPUnit event listener`:https://phpunit.de/manual/current/en/extending-phpunit.html#extending-phpunit.PHPUnit_Framework_TestListener
574574
.. _`PHPUnit's assertStringMatchesFormat()`:https://phpunit.de/manual/current/en/appendixes.assertions.html#appendixes.assertions.assertStringMatchesFormat
575-
.. _`PHP error handler`:http://php.net/manual/en/book.errorfunc.php
575+
.. _`PHP error handler`:https://php.net/manual/en/book.errorfunc.php
576576
.. _`environment variable`:https://phpunit.de/manual/current/en/appendixes.configuration.html#appendixes.configuration.php-ini-constants-variables
577577
.. _Packagist:https://packagist.org/packages/symfony/phpunit-bridge
578-
.. _`@-silencing operator`:http://php.net/manual/en/language.operators.errorcontrol.php
579-
.. _`@-silenced`:http://php.net/manual/en/language.operators.errorcontrol.php
578+
.. _`@-silencing operator`:https://php.net/manual/en/language.operators.errorcontrol.php
579+
.. _`@-silenced`:https://php.net/manual/en/language.operators.errorcontrol.php
580580
.. _`Travis CI`:https://travis-ci.org/
581581
.. _`test listener`:https://phpunit.de/manual/current/en/appendixes.configuration.html#appendixes.configuration.test-listeners
582582
.. _`@covers`:https://phpunit.de/manual/current/en/appendixes.annotations.html#appendixes.annotations.covers

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp