Skip to content
This repository has been archived by the owner on Sep 16, 2021. It is now read-only.

Commit

Permalink
Merge branch '2.8' into 3.0
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
fabpot committed May 3, 2016
2 parents 7c21991 + 5d264c2 commit 35f8960
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 13 deletions.
2 changes: 1 addition & 1 deletion app/config/config_prod.yml
Expand Up @@ -5,7 +5,7 @@ imports:
# validation:
# cache: validator.mapping.cache.doctrine.apc
# serializer:
# cache: serializer.mapping.cache.doctrine.apc
# cache: serializer.mapping.cache.apc

#doctrine:
# orm:
Expand Down
4 changes: 2 additions & 2 deletions phpunit.xml.dist
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- http://phpunit.de/manual/4.1/en/appendixes.configuration.html -->
<!-- https://phpunit.de/manual/current/en/appendixes.configuration.html -->
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.8/phpunit.xsd"
backupGlobals="false"
colors="true"
bootstrap="app/autoload.php"
Expand Down
10 changes: 0 additions & 10 deletions web/app.php
Expand Up @@ -8,16 +8,6 @@
$loader = require __DIR__.'/../app/autoload.php';
include_once __DIR__.'/../var/bootstrap.php.cache';

// Enable APC for autoloading to improve performance.
// You should change the ApcClassLoader first argument to a unique prefix
// in order to prevent cache key conflicts with other applications
// also using APC.
/*
$apcLoader = new Symfony\Component\ClassLoader\ApcClassLoader(sha1(__FILE__), $loader);
$loader->unregister();
$apcLoader->register(true);
*/

$kernel = new AppKernel('prod', false);
$kernel->loadClassCache();
//$kernel = new AppCache($kernel);
Expand Down

0 comments on commit 35f8960

Please sign in to comment.