diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '3.4' into 4.0 

* 3.4:
  [travis] fix php-ext/ location
  throw exception if docblock factory does not exist
This commit is contained in:
Nicolas Grekas 2018-02-22 13:30:04 +01:00
parent 0dc6acb123 638bb70353
commit cffa7be92f
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -103,7 +103,7 @@ before_install:
local ext_name=$1 local ext_name=$1
local ext_so=$2 local ext_so=$2
local ext_dir=$(php -r "echo ini_get('extension_dir');") local ext_dir=$(php -r "echo ini_get('extension_dir');")
local ext_cache=~/php-ext/$(basename $ext_dir)/$ext_name local ext_cache=php-ext/$(basename $ext_dir)/$ext_name
if [[ -e $ext_cache/$ext_so ]]; then if [[ -e $ext_cache/$ext_so ]]; then
echo extension = $ext_cache/$ext_so >> $INI echo extension = $ext_cache/$ext_so >> $INI
@ -134,7 +134,7 @@ before_install:
# Install extra PHP extensions # Install extra PHP extensions
if [[ ! $skip ]]; then if [[ ! $skip ]]; then
# install libsodium # install libsodium
if [[ ! -e ~/php-ext/$(php -r "echo basename(ini_get('extension_dir'));")/libsodium/sodium.so ]]; then if [[ ! -e php-ext/$(php -r "echo basename(ini_get('extension_dir'));")/libsodium/sodium.so ]]; then
sudo add-apt-repository ppa:ondrej/php -y sudo add-apt-repository ppa:ondrej/php -y
sudo apt-get update -q sudo apt-get update -q
sudo apt-get install libsodium-dev -y sudo apt-get install libsodium-dev -y

4
src/Symfony/Component/PropertyInfo/Extractor/PhpDocExtractor.php
View File

@ -53,6 +53,10 @@ class PhpDocExtractor implements PropertyDescriptionExtractorInterface, Property
*/ */
public function __construct(DocBlockFactoryInterface $docBlockFactory = null, array $mutatorPrefixes = null, array $accessorPrefixes = null, array $arrayMutatorPrefixes = null) public function __construct(DocBlockFactoryInterface $docBlockFactory = null, array $mutatorPrefixes = null, array $accessorPrefixes = null, array $arrayMutatorPrefixes = null)
{ {
if (!class_exists(DocBlockFactory::class)) {
throw new \RuntimeException(sprintf('Unable to use the "%s" class as the "phpdocumentor/reflection-docblock" package is not installed.', __CLASS__));
}
$this->docBlockFactory = $docBlockFactory ?: DocBlockFactory::createInstance(); $this->docBlockFactory = $docBlockFactory ?: DocBlockFactory::createInstance();
$this->contextFactory = new ContextFactory(); $this->contextFactory = new ContextFactory();
$this->phpDocTypeHelper = new PhpDocTypeHelper(); $this->phpDocTypeHelper = new PhpDocTypeHelper();