Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
project
drupal
Commits
8b2f85b5
Commit
8b2f85b5
authored
Mar 24, 2015
by
alexpott
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue
#2458045
by webflo: Remove calls to core/vendor/autoload.php
parent
6d04d2b8
Changes
12
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
12 additions
and
12 deletions
+12
-12
autoload.php
autoload.php
+1
-1
core/includes/install.core.inc
core/includes/install.core.inc
+1
-1
core/modules/simpletest/src/InstallerTestBase.php
core/modules/simpletest/src/InstallerTestBase.php
+1
-1
core/modules/simpletest/src/KernelTestBase.php
core/modules/simpletest/src/KernelTestBase.php
+1
-1
core/modules/simpletest/src/WebTestBase.php
core/modules/simpletest/src/WebTestBase.php
+1
-1
core/modules/system/src/Tests/DrupalKernel/DrupalKernelTest.php
...odules/system/src/Tests/DrupalKernel/DrupalKernelTest.php
+2
-2
core/modules/system/src/Tests/System/IgnoreReplicaSubscriberTest.php
...s/system/src/Tests/System/IgnoreReplicaSubscriberTest.php
+1
-1
core/scripts/migrate-dump-d6.sh
core/scripts/migrate-dump-d6.sh
+1
-1
core/scripts/password-hash.sh
core/scripts/password-hash.sh
+1
-1
core/scripts/rebuild_token_calculator.sh
core/scripts/rebuild_token_calculator.sh
+1
-1
core/scripts/run-tests.sh
core/scripts/run-tests.sh
+0
-0
core/tests/bootstrap.php
core/tests/bootstrap.php
+1
-1
No files found.
autoload.php
View file @
8b2f85b5
...
...
@@ -16,4 +16,4 @@
* @see core/modules/statistics/statistics.php
*/
return
require
_once
__DIR__
.
'/core/vendor/autoload.php'
;
return
require
__DIR__
.
'/core/vendor/autoload.php'
;
core/includes/install.core.inc
View file @
8b2f85b5
...
...
@@ -98,7 +98,7 @@ function install_drupal($class_loader, $settings = array()) {
// infrastructure in https://www.drupal.org/node/2389243
if
(
is_array
(
$class_loader
)
&&
$settings
===
array
())
{
$settings
=
$class_loader
;
$class_loader
=
require
__DIR__
.
'/../
vendor
/autoload.php'
;
$class_loader
=
require
__DIR__
.
'/../
..
/autoload.php'
;
}
global
$install_state
;
...
...
core/modules/simpletest/src/InstallerTestBase.php
View file @
8b2f85b5
...
...
@@ -140,7 +140,7 @@ protected function setUp() {
// Import new settings.php written by the installer.
$request
=
Request
::
createFromGlobals
();
$class_loader
=
require
$this
->
container
->
get
(
'app.root'
)
.
'/
core/vendor/
autoload.php'
;
$class_loader
=
require
$this
->
container
->
get
(
'app.root'
)
.
'/autoload.php'
;
Settings
::
initialize
(
$this
->
container
->
get
(
'app.root'
),
DrupalKernel
::
findSitePath
(
$request
),
$class_loader
);
foreach
(
$GLOBALS
[
'config_directories'
]
as
$type
=>
$path
)
{
$this
->
configDirectories
[
$type
]
=
$path
;
...
...
core/modules/simpletest/src/KernelTestBase.php
View file @
8b2f85b5
...
...
@@ -178,7 +178,7 @@ protected function setUp() {
$GLOBALS
[
'conf'
][
'container_service_providers'
][
'TestServiceProvider'
]
=
'Drupal\simpletest\TestServiceProvider'
;
// Bootstrap a new kernel.
$class_loader
=
require
DRUPAL_ROOT
.
'/
core/vendor/
autoload.php'
;
$class_loader
=
require
DRUPAL_ROOT
.
'/autoload.php'
;
$this
->
kernel
=
new
DrupalKernel
(
'testing'
,
$class_loader
,
FALSE
);
$request
=
Request
::
create
(
'/'
);
$site_path
=
DrupalKernel
::
findSitePath
(
$request
);
...
...
core/modules/simpletest/src/WebTestBase.php
View file @
8b2f85b5
...
...
@@ -862,7 +862,7 @@ protected function setUp() {
// Since Drupal is bootstrapped already, install_begin_request() will not
// bootstrap again. Hence, we have to reload the newly written custom
// settings.php manually.
$class_loader
=
require
DRUPAL_ROOT
.
'/
core/vendor/
autoload.php'
;
$class_loader
=
require
DRUPAL_ROOT
.
'/autoload.php'
;
Settings
::
initialize
(
DRUPAL_ROOT
,
$this
->
siteDirectory
,
$class_loader
);
// Execute the non-interactive installer.
...
...
core/modules/system/src/Tests/DrupalKernel/DrupalKernelTest.php
View file @
8b2f85b5
...
...
@@ -61,7 +61,7 @@ protected function prepareConfigDirectories() {
*/
protected
function
getTestKernel
(
Request
$request
,
array
$modules_enabled
=
NULL
,
$read_only
=
FALSE
)
{
// Manually create kernel to avoid replacing settings.
$class_loader
=
require
DRUPAL_ROOT
.
'/
core/vendor/
autoload.php'
;
$class_loader
=
require
DRUPAL_ROOT
.
'/autoload.php'
;
$kernel
=
DrupalKernel
::
createFromRequest
(
$request
,
$class_loader
,
'testing'
);
$this
->
settingsSet
(
'container_yamls'
,
[]);
$this
->
settingsSet
(
'hash_salt'
,
$this
->
databasePrefix
);
...
...
@@ -168,7 +168,7 @@ public function testCompileDIC() {
*/
public
function
testRepeatedBootWithDifferentEnvironment
()
{
$request
=
Request
::
createFromGlobals
();
$class_loader
=
require
DRUPAL_ROOT
.
'/
core/vendor/
autoload.php'
;
$class_loader
=
require
DRUPAL_ROOT
.
'/autoload.php'
;
$environments
=
[
'testing1'
,
...
...
core/modules/system/src/Tests/System/IgnoreReplicaSubscriberTest.php
View file @
8b2f85b5
...
...
@@ -32,7 +32,7 @@ function testSystemInitIgnoresSecondaries() {
Database
::
addConnectionInfo
(
'default'
,
'replica'
,
$connection_info
[
'default'
]);
db_ignore_replica
();
$class_loader
=
require
\
Drupal
::
root
()
.
'/
core/vendor/
autoload.php'
;
$class_loader
=
require
\
Drupal
::
root
()
.
'/autoload.php'
;
$kernel
=
new
DrupalKernel
(
'testing'
,
$class_loader
,
FALSE
);
$event
=
new
GetResponseEvent
(
$kernel
,
Request
::
create
(
'http://example.com'
),
HttpKernelInterface
::
MASTER_REQUEST
);
$subscriber
=
new
ReplicaDatabaseIgnoreSubscriber
();
...
...
core/scripts/migrate-dump-d6.sh
View file @
8b2f85b5
...
...
@@ -29,7 +29,7 @@
return;
}
$autoloader = require __DIR__ . '
/../
vendor
/autoload.php
';
$autoloader = require __DIR__ . '
/../
..
/autoload.php
';
require_once __DIR__ . '
/../includes/bootstrap.inc
';
$request = Request::createFromGlobals();
...
...
core/scripts/password-hash.sh
View file @
8b2f85b5
...
...
@@ -55,7 +55,7 @@
// Password list to be processed.
$passwords
=
$_SERVER
[
'argv'
]
;
$autoloader
=
require __DIR__
.
'/../
vendor
/autoload.php'
;
$autoloader
=
require __DIR__
.
'/../
..
/autoload.php'
;
$request
=
Request::createFromGlobals
()
;
$kernel
=
DrupalKernel::createFromRequest
(
$request
,
$autoloader
,
'prod'
, FALSE
)
;
...
...
core/scripts/rebuild_token_calculator.sh
View file @
8b2f85b5
...
...
@@ -15,7 +15,7 @@
return
;
}
require __DIR__
.
'/../
vendor
/autoload.php'
;
require __DIR__
.
'/../
..
/autoload.php'
;
require_once __DIR__
.
'/../includes/bootstrap.inc'
;
$request
=
Request::createFromGlobals
()
;
...
...
core/scripts/run-tests.sh
100644 → 100755
View file @
8b2f85b5
File mode changed from 100644 to 100755
core/tests/bootstrap.php
View file @
8b2f85b5
...
...
@@ -68,7 +68,7 @@ function drupal_phpunit_register_extension_dirs(Composer\Autoload\ClassLoader $l
}
// Start with classes in known locations.
$loader
=
require
__DIR__
.
'/../
vendor
/autoload.php'
;
$loader
=
require
__DIR__
.
'/../
..
/autoload.php'
;
$loader
->
add
(
'Drupal\\Tests'
,
__DIR__
);
// Scan for arbitrary extension namespaces from core and contrib.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment