Skip to content

Commit 7d2738b

Browse files
desrosjdesrosj
committed
Merge remote-tracking branch 'upstream/trunk' into trunk
2 parents e7c0b0f + 2553772 commit 7d2738b

84 files changed

Lines changed: 3533 additions & 4270 deletions

Some content is hidden

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

‎src/wp-includes/SimplePie/autoloader.php‎

Lines changed: 2 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,7 @@
11
<?php
2-
/**
3-
* SimplePie
4-
*
5-
* A PHP-Based RSS and Atom Feed Framework.
6-
* Takes the hard work out of managing a complete RSS/Atom solution.
7-
*
8-
* Copyright (c) 2004-2022, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
9-
* All rights reserved.
10-
*
11-
* Redistribution and use in source and binary forms, with or without modification, are
12-
* permitted provided that the following conditions are met:
13-
*
14-
* * Redistributions of source code must retain the above copyright notice, this list of
15-
* conditions and the following disclaimer.
16-
*
17-
* * Redistributions in binary form must reproduce the above copyright notice, this list
18-
* of conditions and the following disclaimer in the documentation and/or other materials
19-
* provided with the distribution.
20-
*
21-
* * Neither the name of the SimplePie Team nor the names of its contributors may be used
22-
* to endorse or promote products derived from this software without specific prior
23-
* written permission.
24-
*
25-
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
26-
* OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
27-
* AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
28-
* AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
29-
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
30-
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
31-
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
32-
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
33-
* POSSIBILITY OF SUCH DAMAGE.
34-
*
35-
* @package SimplePie
36-
* @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
37-
* @author Ryan Parman
38-
* @author Sam Sneddon
39-
* @author Ryan McCue
40-
* @link http://simplepie.org/ SimplePie
41-
* @license http://www.opensource.org/licenses/bsd-license.php BSD License
42-
*/
432

3+
// SPDX-FileCopyrightText: 2004-2023 Ryan Parman, Sam Sneddon, Ryan McCue
4+
// SPDX-License-Identifier: BSD-3-Clause
445

456
/**
467
* PSR-4 implementation for SimplePie.
@@ -93,9 +54,6 @@
9354

9455
/**
9556
* Autoloader class
96-
*
97-
* @package SimplePie
98-
* @subpackage API
9957
*/
10058
class SimplePie_Autoloader
10159
{

‎src/wp-includes/SimplePie/library/SimplePie.php‎

Lines changed: 5 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,17 @@
11
<?php
22

3-
/**
4-
* SimplePie
5-
*
6-
* A PHP-Based RSS and Atom Feed Framework.
7-
* Takes the hard work out of managing a complete RSS/Atom solution.
8-
*
9-
* Copyright (c) 2004-2017, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
10-
* All rights reserved.
11-
*
12-
* Redistribution and use in source and binary forms, with or without modification, are
13-
* permitted provided that the following conditions are met:
14-
*
15-
* * Redistributions of source code must retain the above copyright notice, this list of
16-
* conditions and the following disclaimer.
17-
*
18-
* * Redistributions in binary form must reproduce the above copyright notice, this list
19-
* of conditions and the following disclaimer in the documentation and/or other materials
20-
* provided with the distribution.
21-
*
22-
* * Neither the name of the SimplePie Team nor the names of its contributors may be used
23-
* to endorse or promote products derived from this software without specific prior
24-
* written permission.
25-
*
26-
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
27-
* OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
28-
* AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
29-
* AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
30-
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
31-
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
32-
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
33-
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
34-
* POSSIBILITY OF SUCH DAMAGE.
35-
*
36-
* @package SimplePie
37-
* @version 1.7.0
38-
* @copyright 2004-2017 Ryan Parman, Sam Sneddon, Ryan McCue
39-
* @author Ryan Parman
40-
* @author Sam Sneddon
41-
* @author Ryan McCue
42-
* @link http://simplepie.org/ SimplePie
43-
* @license http://www.opensource.org/licenses/bsd-license.php BSD License
44-
*/
3+
// SPDX-FileCopyrightText: 2004-2023 Ryan Parman, Sam Sneddon, Ryan McCue
4+
// SPDX-License-Identifier: BSD-3-Clause
5+
6+
declare(strict_types=1);
457

468
use SimplePie\SimplePie as NamespacedSimplePie;
479

4810
class_exists('SimplePie\SimplePie');
4911

5012
// @trigger_error(sprintf('Using the "SimplePie" class is deprecated since SimplePie 1.7.0, use "SimplePie\SimplePie" instead.'), \E_USER_DEPRECATED);
5113

14+
/** @phpstan-ignore-next-line */
5215
if (\false) {
5316
/** @deprecated since SimplePie 1.7.0, use "SimplePie\SimplePie" instead */
5417
class SimplePie extends NamespacedSimplePie

‎src/wp-includes/SimplePie/library/SimplePie/Author.php‎

Lines changed: 5 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,17 @@
11
<?php
22

3-
/**
4-
* SimplePie
5-
*
6-
* A PHP-Based RSS and Atom Feed Framework.
7-
* Takes the hard work out of managing a complete RSS/Atom solution.
8-
*
9-
* Copyright (c) 2004-2022, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
10-
* All rights reserved.
11-
*
12-
* Redistribution and use in source and binary forms, with or without modification, are
13-
* permitted provided that the following conditions are met:
14-
*
15-
* * Redistributions of source code must retain the above copyright notice, this list of
16-
* conditions and the following disclaimer.
17-
*
18-
* * Redistributions in binary form must reproduce the above copyright notice, this list
19-
* of conditions and the following disclaimer in the documentation and/or other materials
20-
* provided with the distribution.
21-
*
22-
* * Neither the name of the SimplePie Team nor the names of its contributors may be used
23-
* to endorse or promote products derived from this software without specific prior
24-
* written permission.
25-
*
26-
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
27-
* OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
28-
* AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
29-
* AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
30-
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
31-
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
32-
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
33-
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
34-
* POSSIBILITY OF SUCH DAMAGE.
35-
*
36-
* @package SimplePie
37-
* @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
38-
* @author Ryan Parman
39-
* @author Sam Sneddon
40-
* @author Ryan McCue
41-
* @link http://simplepie.org/ SimplePie
42-
* @license http://www.opensource.org/licenses/bsd-license.php BSD License
43-
*/
3+
// SPDX-FileCopyrightText: 2004-2023 Ryan Parman, Sam Sneddon, Ryan McCue
4+
// SPDX-License-Identifier: BSD-3-Clause
5+
6+
declare(strict_types=1);
447

458
use SimplePie\Author;
469

4710
class_exists('SimplePie\Author');
4811

4912
// @trigger_error(sprintf('Using the "SimplePie_Author" class is deprecated since SimplePie 1.7.0, use "SimplePie\Author" instead.'), \E_USER_DEPRECATED);
5013

14+
/** @phpstan-ignore-next-line */
5115
if (\false) {
5216
/** @deprecated since SimplePie 1.7.0, use "SimplePie\Author" instead */
5317
class SimplePie_Author extends Author

‎src/wp-includes/SimplePie/library/SimplePie/Cache.php‎

Lines changed: 5 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,17 @@
11
<?php
22

3-
/**
4-
* SimplePie
5-
*
6-
* A PHP-Based RSS and Atom Feed Framework.
7-
* Takes the hard work out of managing a complete RSS/Atom solution.
8-
*
9-
* Copyright (c) 2004-2022, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
10-
* All rights reserved.
11-
*
12-
* Redistribution and use in source and binary forms, with or without modification, are
13-
* permitted provided that the following conditions are met:
14-
*
15-
* * Redistributions of source code must retain the above copyright notice, this list of
16-
* conditions and the following disclaimer.
17-
*
18-
* * Redistributions in binary form must reproduce the above copyright notice, this list
19-
* of conditions and the following disclaimer in the documentation and/or other materials
20-
* provided with the distribution.
21-
*
22-
* * Neither the name of the SimplePie Team nor the names of its contributors may be used
23-
* to endorse or promote products derived from this software without specific prior
24-
* written permission.
25-
*
26-
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
27-
* OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
28-
* AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
29-
* AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
30-
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
31-
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
32-
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
33-
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
34-
* POSSIBILITY OF SUCH DAMAGE.
35-
*
36-
* @package SimplePie
37-
* @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
38-
* @author Ryan Parman
39-
* @author Sam Sneddon
40-
* @author Ryan McCue
41-
* @link http://simplepie.org/ SimplePie
42-
* @license http://www.opensource.org/licenses/bsd-license.php BSD License
43-
*/
3+
// SPDX-FileCopyrightText: 2004-2023 Ryan Parman, Sam Sneddon, Ryan McCue
4+
// SPDX-License-Identifier: BSD-3-Clause
5+
6+
declare(strict_types=1);
447

458
use SimplePie\Cache;
469

4710
class_exists('SimplePie\Cache');
4811

4912
// @trigger_error(sprintf('Using the "SimplePie_Cache" class is deprecated since SimplePie 1.7.0, use "SimplePie\Cache" instead.'), \E_USER_DEPRECATED);
5013

14+
/** @phpstan-ignore-next-line */
5115
if (\false) {
5216
/** @deprecated since SimplePie 1.7.0, use "SimplePie\Cache" instead */
5317
class SimplePie_Cache extends Cache

‎src/wp-includes/SimplePie/library/SimplePie/Cache/Base.php‎

Lines changed: 5 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,17 @@
11
<?php
22

3-
/**
4-
* SimplePie
5-
*
6-
* A PHP-Based RSS and Atom Feed Framework.
7-
* Takes the hard work out of managing a complete RSS/Atom solution.
8-
*
9-
* Copyright (c) 2004-2022, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
10-
* All rights reserved.
11-
*
12-
* Redistribution and use in source and binary forms, with or without modification, are
13-
* permitted provided that the following conditions are met:
14-
*
15-
* * Redistributions of source code must retain the above copyright notice, this list of
16-
* conditions and the following disclaimer.
17-
*
18-
* * Redistributions in binary form must reproduce the above copyright notice, this list
19-
* of conditions and the following disclaimer in the documentation and/or other materials
20-
* provided with the distribution.
21-
*
22-
* * Neither the name of the SimplePie Team nor the names of its contributors may be used
23-
* to endorse or promote products derived from this software without specific prior
24-
* written permission.
25-
*
26-
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
27-
* OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
28-
* AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
29-
* AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
30-
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
31-
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
32-
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
33-
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
34-
* POSSIBILITY OF SUCH DAMAGE.
35-
*
36-
* @package SimplePie
37-
* @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
38-
* @author Ryan Parman
39-
* @author Sam Sneddon
40-
* @author Ryan McCue
41-
* @link http://simplepie.org/ SimplePie
42-
* @license http://www.opensource.org/licenses/bsd-license.php BSD License
43-
*/
3+
// SPDX-FileCopyrightText: 2004-2023 Ryan Parman, Sam Sneddon, Ryan McCue
4+
// SPDX-License-Identifier: BSD-3-Clause
5+
6+
declare(strict_types=1);
447

458
use SimplePie\Cache\Base;
469

4710
interface_exists('SimplePie\Cache\Base');
4811

4912
// @trigger_error(sprintf('Using the "SimplePie_Cache_Base" class is deprecated since SimplePie 1.7.0, use "SimplePie\Cache\Base" instead.'), \E_USER_DEPRECATED);
5013

14+
/** @phpstan-ignore-next-line */
5115
if (\false) {
5216
/** @deprecated since SimplePie 1.7.0, use "SimplePie\Cache\Base" instead */
5317
interface SimplePie_Cache_Base extends Base

‎src/wp-includes/SimplePie/library/SimplePie/Cache/DB.php‎

Lines changed: 5 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,17 @@
11
<?php
22

3-
/**
4-
* SimplePie
5-
*
6-
* A PHP-Based RSS and Atom Feed Framework.
7-
* Takes the hard work out of managing a complete RSS/Atom solution.
8-
*
9-
* Copyright (c) 2004-2022, Ryan Parman, Sam Sneddon, Ryan McCue, and contributors
10-
* All rights reserved.
11-
*
12-
* Redistribution and use in source and binary forms, with or without modification, are
13-
* permitted provided that the following conditions are met:
14-
*
15-
* * Redistributions of source code must retain the above copyright notice, this list of
16-
* conditions and the following disclaimer.
17-
*
18-
* * Redistributions in binary form must reproduce the above copyright notice, this list
19-
* of conditions and the following disclaimer in the documentation and/or other materials
20-
* provided with the distribution.
21-
*
22-
* * Neither the name of the SimplePie Team nor the names of its contributors may be used
23-
* to endorse or promote products derived from this software without specific prior
24-
* written permission.
25-
*
26-
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
27-
* OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
28-
* AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
29-
* AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
30-
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
31-
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
32-
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
33-
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
34-
* POSSIBILITY OF SUCH DAMAGE.
35-
*
36-
* @package SimplePie
37-
* @copyright 2004-2016 Ryan Parman, Sam Sneddon, Ryan McCue
38-
* @author Ryan Parman
39-
* @author Sam Sneddon
40-
* @author Ryan McCue
41-
* @link http://simplepie.org/ SimplePie
42-
* @license http://www.opensource.org/licenses/bsd-license.php BSD License
43-
*/
3+
// SPDX-FileCopyrightText: 2004-2023 Ryan Parman, Sam Sneddon, Ryan McCue
4+
// SPDX-License-Identifier: BSD-3-Clause
5+
6+
declare(strict_types=1);
447

458
use SimplePie\Cache\DB;
469

4710
class_exists('SimplePie\Cache\DB');
4811

4912
// @trigger_error(sprintf('Using the "SimplePie_Cache_DB" class is deprecated since SimplePie 1.7.0, use "SimplePie\Cache\DB" instead.'), \E_USER_DEPRECATED);
5013

14+
/** @phpstan-ignore-next-line */
5115
if (\false) {
5216
/** @deprecated since SimplePie 1.7.0, use "SimplePie\Cache\DB" instead */
5317
abstract class SimplePie_Cache_DB extends DB

0 commit comments

Comments
 (0)