This commit is contained in:
Fabien Potencier 2012-12-11 11:49:22 +01:00
parent 3c010db2cb
commit fdb11be242
34 changed files with 53 additions and 70 deletions

View File

@ -89,6 +89,7 @@ EOF
}
$this->outputTags($output, $input->getOption('show-private'));
return;
}

View File

@ -59,18 +59,7 @@
<label for="priority">Priority</label>
<select id="priority" name="priority" onchange="document.getElementById('priority-form').submit(); ">
{# values < 0 are custom levels #}
{% for value, text in {
100: 'DEBUG',
200: 'INFO',
250: 'NOTICE',
300: 'WARNING',
400: 'ERROR',
500: 'CRITICAL',
550: 'ALERT',
600: 'EMERGENCY',
'-100': 'DEPRECATION only'
}
%}
{% for value, text in { 100: 'DEBUG', 200: 'INFO', 250: 'NOTICE', 300: 'WARNING', 400: 'ERROR', 500: 'CRITICAL', 550: 'ALERT', 600: 'EMERGENCY', '-100': 'DEPRECATION only' } %}
<option value="{{ value }}"{{ value == priority ? ' selected' : '' }}>{{ text }}</option>
{% endfor %}
</select>
@ -122,11 +111,7 @@
{% set from = '-' %}
{% endif %}
<li>Called from {{ call.file is defined and call.line is defined
? call.file|format_file(call.line, from)
: from|raw
}}
</li>
<li>Called from {{ call.file is defined and call.line is defined ? call.file|format_file(call.line, from) : from|raw }}</li>
{{ index == log.context.stack|length - 1 ? '</ul>' : '' }}
{% endfor %}

View File

@ -316,6 +316,7 @@ abstract class AbstractFindAdapter extends AbstractAdapter
switch ($sort) {
case SortableIterator::SORT_BY_NAME:
$command->ins('sort')->add('| sort');
return;
case SortableIterator::SORT_BY_TYPE:
$format = '%y';

View File

@ -11,7 +11,6 @@
namespace Symfony\Component\Finder\Adapter;
use Symfony\Component\Finder\Iterator;
use Symfony\Component\Finder\Shell\Shell;
use Symfony\Component\Finder\Shell\Command;

View File

@ -11,7 +11,6 @@
namespace Symfony\Component\Finder\Adapter;
use Symfony\Component\Finder\Iterator;
use Symfony\Component\Finder\Shell\Shell;
use Symfony\Component\Finder\Shell\Command;

View File

@ -10,5 +10,5 @@ interface ExceptionInterface
/**
* @return \Symfony\Component\Finder\Adapter\AdapterInterface
*/
function getAdapter();
public function getAdapter();
}

View File

@ -21,28 +21,28 @@ interface ValueInterface
*
* @return string
*/
function render();
public function render();
/**
* Renders string representation of pattern.
*
* @return string
*/
function renderPattern();
public function renderPattern();
/**
* Returns value case sensitivity.
*
* @return bool
*/
function isCaseSensitive();
public function isCaseSensitive();
/**
* Returns expression type.
*
* @return int
*/
function getType();
public function getType();
/**
* @param string $expr

View File

@ -406,7 +406,6 @@ class FinderTest extends Iterator\RealIteratorTestCase
$finder = $finder->append($finder1);
$this->assertIterator($this->toAbsolute(array('foo', 'foo/bar.tmp', 'toto')), $finder->getIterator());
}

View File

@ -83,4 +83,3 @@ class PathFilterIteratorTest extends IteratorTestCase
}
}

View File

@ -482,6 +482,7 @@ class FormTypeTest extends TypeTestCase
$builder->get('referenceCopy')->addViewTransformer(new CallbackTransformer(
function () {},
function ($value) { // reverseTransform
return 'foobar';
}
));
@ -507,6 +508,7 @@ class FormTypeTest extends TypeTestCase
$builder->get('referenceCopy')->addViewTransformer(new CallbackTransformer(
function () {},
function ($value) use ($ref2) { // reverseTransform
return $ref2;
}
));

View File

@ -12,13 +12,11 @@
namespace Symfony\Component\Form\Tests\Extension\Validator\Constraints;
use Symfony\Component\Form\FormBuilder;
use Symfony\Component\Validator\ConstraintViolation;
use Symfony\Component\Form\Exception\TransformationFailedException;
use Symfony\Component\Form\CallbackTransformer;
use Symfony\Component\Form\FormInterface;
use Symfony\Component\Form\Extension\Validator\Constraints\Form;
use Symfony\Component\Form\Extension\Validator\Constraints\FormValidator;
use Symfony\Component\Form\Util\PropertyPath;
use Symfony\Component\Validator\Constraint;
use Symfony\Component\Validator\Constraints\NotNull;
use Symfony\Component\Validator\Constraints\NotBlank;

View File

@ -102,7 +102,6 @@ class UploadedFileTest extends \PHPUnit_Framework_TestCase
$this->assertEquals('gif', $file->getClientOriginalExtension());
}
/**
* @expectedException Symfony\Component\HttpFoundation\File\Exception\FileException
*/

View File

@ -84,6 +84,7 @@ class Store implements StoreInterface
return true;
}
return !file_exists($path) ?: $path;
}

View File

@ -194,7 +194,7 @@ class TraceableEventDispatcherTest extends \PHPUnit_Framework_TestCase
class EventSubscriber implements EventSubscriberInterface
{
static public function getSubscribedEvents()
public static function getSubscribedEvents()
{
return array('foo' => 'call');
}

View File

@ -521,6 +521,7 @@ class OptionsTest extends \PHPUnit_Framework_TestCase
$this->options->setNormalizer('foo', function (Options $options, $previousValue) use ($test) {
$test->assertNull($previousValue);
return '';
});
$this->assertEquals(array('foo' => ''), $this->options->all());

View File

@ -83,6 +83,7 @@ class ApacheUrlMatcher extends UrlMatcher
if (null !== $route) {
$parameters['_route'] = $route;
return $this->mergeDefaults($parameters, $defaults);
} elseif (0 < count($allow)) {
throw new MethodNotAllowedException($allow);

View File

@ -11,7 +11,6 @@
namespace Symfony\Component\Security\Core\Util;
/**
* Interface that needs to be implemented by all secure random number generators.
*

View File

@ -279,4 +279,3 @@ class Section
return $this->events;
}
}