code format
be APC-enabled (PHP bug #61384)

https://bugs.php.net/bug.php?id=61384
merge AOP pointcuts in two module