Enforce all error report for php tests. (#3670)

* Enforce all error report for php tests.

* Import vendor/autoload.php in tests/bootstrap_phpunit.php
pull/3676/head
Paul Yang 8 years ago committed by GitHub
parent c20440222a
commit ae55fd2cc5
  1. 1
      Makefile.am
  2. 2
      php/phpunit.xml
  3. 20
      php/src/Google/Protobuf/Internal/DescriptorPool.php
  4. 2
      php/tests/autoload.php
  5. 5
      php/tests/bootstrap_phpunit.php

@ -674,6 +674,7 @@ php_EXTRA_DIST= \
php/src/GPBMetadata/Google/Protobuf/Internal/Descriptor.php \
php/tests/array_test.php \
php/tests/autoload.php \
php/tests/bootstrap_phpunit.php \
php/tests/compatibility_test.sh \
php/tests/descriptors_test.php \
php/tests/encode_decode_test.php \

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit bootstrap="./vendor/autoload.php"
<phpunit bootstrap="./tests/bootstrap_phpunit.php"
colors="true">
<testsuites>
<testsuite name="protobuf-tests">

@ -109,18 +109,30 @@ class DescriptorPool
public function getDescriptorByClassName($klass)
{
return $this->class_to_desc[$klass];
if (isset($this->class_to_desc[$klass])) {
return $this->class_to_desc[$klass];
} else {
return null;
}
}
public function getEnumDescriptorByClassName($klass)
{
return $this->class_to_enum_desc[$klass];
if (isset($this->class_to_enum_desc[$klass])) {
return $this->class_to_enum_desc[$klass];
} else {
return null;
}
}
public function getDescriptorByProtoName($proto)
{
$klass = $this->proto_to_class[$proto];
return $this->class_to_desc[$klass];
if (isset($this->proto_to_class[$proto])) {
$klass = $this->proto_to_class[$proto];
return $this->class_to_desc[$klass];
} else {
return null;
}
}
public function getEnumDescriptorByProtoName($proto)

@ -1,5 +1,7 @@
<?php
error_reporting(E_ALL);
function getGeneratedFiles($dir, &$results = array())
{
$files = scandir($dir);

@ -0,0 +1,5 @@
<?php
require_once("vendor/autoload.php");
error_reporting(E_ALL);
Loading…
Cancel
Save