Commit 94ee8397 authored by catch's avatar catch
Browse files

Issue #3255350 by alexpott, longwave: Remove PHP 7 code from Drupal 10

parent 87fc0a7d

.htaccess

+0 −7
Original line number Diff line number Diff line
@@ -26,13 +26,6 @@ AddEncoding gzip svgz 
# sites/default/default.settings.php and

# Drupal\Core\DrupalKernel::bootEnvironment() for settings that can be

# changed at runtime.



# PHP 7, Apache 1 and 2.

<IfModule mod_php7.c>

  php_value assert.active                   0

</IfModule>



# PHP 8, Apache 1 and 2.

<IfModule mod_php.c>

  php_value assert.active                   0

</IfModule>

composer/Plugin/VendorHardening/FileSecurity.php

+0 −3
Original line number Diff line number Diff line
@@ -74,9 +74,6 @@ protected static function htaccessPreventExecution() { 
</Files>



# If we know how to do it safely, disable the PHP engine entirely.

<IfModule mod_php7.c>

  php_flag engine off

</IfModule>

<IfModule mod_php.c>

  php_flag engine off

</IfModule>

core/assets/scaffold/files/example.settings.local.php

+3 −3
Original line number Diff line number Diff line
@@ -26,9 +26,9 @@ 
 * @see http://php.net/assert

 * @see https://www.drupal.org/node/2492225

 *

 * If you are using PHP 7.0 it is strongly recommended that you set

 * zend.assertions=1 in the PHP.ini file (It cannot be changed from .htaccess

 * or runtime) on development machines and to 0 in production.

 * It is strongly recommended that you set zend.assertions=1 in the PHP.ini file

 * (It cannot be changed from .htaccess or runtime) on development machines and

 * to 0 or -1 in production.

 *

 * @see https://wiki.php.net/rfc/expectations

 */

core/assets/scaffold/files/htaccess

+0 −7
Original line number Diff line number Diff line
@@ -26,13 +26,6 @@ AddEncoding gzip svgz 
# sites/default/default.settings.php and

# Drupal\Core\DrupalKernel::bootEnvironment() for settings that can be

# changed at runtime.



# PHP 7, Apache 1 and 2.

<IfModule mod_php7.c>

  php_value assert.active                   0

</IfModule>



# PHP 8, Apache 1 and 2.

<IfModule mod_php.c>

  php_value assert.active                   0

</IfModule>

core/lib/Drupal/Component/Annotation/Doctrine/Compatibility/Php7/ReflectionClass.php

deleted100644 → 0
+0 −48
Original line number Diff line number Diff line 
<?php

// phpcs:ignoreFile



/**

 * @file

 *

 * This class is a near-copy of

 * Doctrine\Common\Reflection\Compatibility\Php7\ReflectionClass, which is part

 * of the Doctrine project: <http://www.doctrine-project.org>. It was copied

 * from version 1.2.2.

 *

 * Original copyright:

 *

 * Copyright (c) 2006-2015 Doctrine Project

 *

 * Permission is hereby granted, free of charge, to any person obtaining a copy of

 * this software and associated documentation files (the "Software"), to deal in

 * the Software without restriction, including without limitation the rights to

 * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies

 * of the Software, and to permit persons to whom the Software is furnished to do

 * so, subject to the following conditions:

 *

 * The above copyright notice and this permission notice shall be included in all

 * copies or substantial portions of the Software.

 */



namespace Drupal\Component\Annotation\Doctrine\Compatibility\Php7;



use ReflectionException;



trait ReflectionClass

{

    /**

     * {@inheritDoc}

     */

    public function getConstants()

    {

        throw new ReflectionException('Method not implemented');

    }



    /**

     * {@inheritDoc}

     */

    public function newInstance($args)

    {

        throw new ReflectionException('Method not implemented');

    }

}