Skip to content
This repository was archived by the owner on Nov 27, 2020. It is now read-only.

Commit 35f8960

Browse files
committed
Merge branch '2.8' into 3.0
* 2.8: updated VENDORS for 2.8.5 dont hint the usage of the ApcuClassLoader anymore updated VENDORS for 2.8.4 updated VENDORS for 2.7.11 [app] updated PHPUnit configuration according to the current supported PHPUnit version. updated VENDORS for 2.3.39 Change back to "serializer.mapping.cache.apc" updated VENDORS for 2.8.3 updated VENDORS for 2.7.10 updated VENDORS for 2.3.38
2 parents 7c21991 + 5d264c2 commit 35f8960

File tree

3 files changed

+3
-13
lines changed

3 files changed

+3
-13
lines changed

app/config/config_prod.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ imports:
55
# validation:
66
# cache: validator.mapping.cache.doctrine.apc
77
# serializer:
8-
# cache: serializer.mapping.cache.doctrine.apc
8+
# cache: serializer.mapping.cache.apc
99

1010
#doctrine:
1111
# orm:

phpunit.xml.dist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

3-
<!-- http://phpunit.de/manual/4.1/en/appendixes.configuration.html -->
3+
<!-- https://phpunit.de/manual/current/en/appendixes.configuration.html -->
44
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5-
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
5+
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.8/phpunit.xsd"
66
backupGlobals="false"
77
colors="true"
88
bootstrap="app/autoload.php"

web/app.php

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,6 @@
88
$loader = require __DIR__.'/../app/autoload.php';
99
include_once __DIR__.'/../var/bootstrap.php.cache';
1010

11-
// Enable APC for autoloading to improve performance.
12-
// You should change the ApcClassLoader first argument to a unique prefix
13-
// in order to prevent cache key conflicts with other applications
14-
// also using APC.
15-
/*
16-
$apcLoader = new Symfony\Component\ClassLoader\ApcClassLoader(sha1(__FILE__), $loader);
17-
$loader->unregister();
18-
$apcLoader->register(true);
19-
*/
20-
2111
$kernel = new AppKernel('prod', false);
2212
$kernel->loadClassCache();
2313
//$kernel = new AppCache($kernel);

0 commit comments

Comments
 (0)