Commit dc8b449c by Tobias Munk

Merge commit 'fbada2e8' into extensions-composer

parents e7c98a49 fbada2e8
...@@ -216,12 +216,14 @@ Using a widget is more straightforward in 2.0. You mainly use the `begin()`, `en ...@@ -216,12 +216,14 @@ Using a widget is more straightforward in 2.0. You mainly use the `begin()`, `en
methods of the `Widget` class. For example, methods of the `Widget` class. For example,
```php ```php
// $this refers to the View object
// Note that you have to "echo" the result to display it // Note that you have to "echo" the result to display it
echo \yii\widgets\Menu::widget(array('items' => $items)); echo \yii\widgets\Menu::widget(array('items' => $items));
// $this refers to the View object // Passing an array to initialize the object properties
$form = \yii\widgets\ActiveForm::begin($this); $form = \yii\widgets\ActiveForm::begin(array(
'options' => array('class' => 'form-horizontal'),
'fieldConfig' => array('inputOptions' => array('class' => 'input-xlarge')),
));
... form inputs here ... ... form inputs here ...
\yii\widgets\ActiveForm::end(); \yii\widgets\ActiveForm::end();
``` ```
......
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
"source": "https://github.com/yiisoft/yii2" "source": "https://github.com/yiisoft/yii2"
}, },
"require": { "require": {
"php": ">=5.3.11", "php": ">=5.3.7",
"ext-mbstring": "*", "ext-mbstring": "*",
"lib-pcre": "*" "lib-pcre": "*"
}, },
......
...@@ -616,6 +616,7 @@ class YiiBase ...@@ -616,6 +616,7 @@ class YiiBase
YiiBase::$aliases = array( YiiBase::$aliases = array(
'@yii' => array( '@yii' => array(
'@yii/bootstrap' => __DIR__ . '/bootstrap', '@yii/bootstrap' => __DIR__ . '/bootstrap',
'@yii/jui' => __DIR__ . '/jui',
'@yii' => __DIR__, '@yii' => __DIR__,
), ),
); );
...@@ -7,28 +7,29 @@ ...@@ -7,28 +7,29 @@
namespace yii\bootstrap; namespace yii\bootstrap;
use Yii;
use yii\base\InvalidConfigException; use yii\base\InvalidConfigException;
use yii\base\Model;
use yii\helpers\base\ArrayHelper; use yii\helpers\base\ArrayHelper;
use yii\helpers\Html; use yii\helpers\Html;
/** /**
* Carousel renders a carousel bootstrap javascript component. * Carousel renders a carousel bootstrap javascript component.
* *
* For example, * For example:
* *
* ```php * ```php
* echo Carousel::widget(array( * echo Carousel::widget(array(
* 'items' => array( * 'items' => array(
* // the item contains only the image
* '<img src="http://twitter.github.io/bootstrap/assets/img/bootstrap-mdo-sfmoma-01.jpg"/>', * '<img src="http://twitter.github.io/bootstrap/assets/img/bootstrap-mdo-sfmoma-01.jpg"/>',
* // equivalent to the above
* array( * array(
* 'content' => '<img src="http://twitter.github.io/bootstrap/assets/img/bootstrap-mdo-sfmoma-02.jpg"/>', * 'content' => '<img src="http://twitter.github.io/bootstrap/assets/img/bootstrap-mdo-sfmoma-02.jpg"/>',
* ), * ),
* // the item contains both the image and the caption
* array( * array(
* 'content' => '<img src="http://twitter.github.io/bootstrap/assets/img/bootstrap-mdo-sfmoma-03.jpg"/>', * 'content' => '<img src="http://twitter.github.io/bootstrap/assets/img/bootstrap-mdo-sfmoma-03.jpg"/>',
* 'options' => array(...) * 'caption' => '<h4>This is title</h4><p>This is the caption text</p>',
* 'caption' => '<h4>This is title</h5><p>This is the caption text</p>' * 'options' => array(...),
* ), * ),
* ) * )
* )); * ));
...@@ -41,20 +42,22 @@ use yii\helpers\Html; ...@@ -41,20 +42,22 @@ use yii\helpers\Html;
class Carousel extends Widget class Carousel extends Widget
{ {
/** /**
* @var array indicates what labels should be displayed on next and previous carousel controls. If [[controls]] is * @var array|boolean the labels for the previous and the next control buttons.
* set to `false` or they do not hold `left` and `right` keys, the controls will not be displayed. * If false, it means the previous and the next control buttons should not be displayed.
*/ */
public $controls = array('left' => '&lsaquo;', 'right' => '&rsaquo;'); public $controls = array('&lsaquo;', '&rsaquo;');
/** /**
* @var array list of images to appear in the carousel. If this property is empty, * @var array list of slides in the carousel. Each array element represents a single
* the widget will not render anything. Each array element represents a single image in the carousel * slide with the following structure:
* with the following structure:
* *
* ```php * ```php
* array( * array(
* 'content' => 'src of the image', // required * // required, slide content (HTML), such as an image tag
* 'options' => ['html attributes of the item'], // optional * 'content' => '<img src="http://twitter.github.io/bootstrap/assets/img/bootstrap-mdo-sfmoma-01.jpg"/>',
* 'caption'=> ['html attributes of the image'] // optional * // optional, the caption (HTML) of the slide
* 'caption'=> '<h4>This is title</h4><p>This is the caption text</p>',
* // optional the HTML attributes of the slide container
* 'options' => array(),
* ) * )
* ``` * ```
*/ */
...@@ -75,97 +78,95 @@ class Carousel extends Widget ...@@ -75,97 +78,95 @@ class Carousel extends Widget
*/ */
public function run() public function run()
{ {
if (empty($this->items)) {
return;
}
echo Html::beginTag('div', $this->options) . "\n"; echo Html::beginTag('div', $this->options) . "\n";
echo $this->renderIndicators() . "\n"; echo $this->renderIndicators() . "\n";
echo $this->renderItems() . "\n"; echo $this->renderItems() . "\n";
echo $this->renderPreviousAndNext() . "\n"; echo $this->renderControls() . "\n";
echo Html::endTag('div') . "\n"; echo Html::endTag('div') . "\n";
$this->registerPlugin('carousel'); $this->registerPlugin('carousel');
} }
/** /**
* Renders carousel indicators * Renders carousel indicators.
* @return string the rendering result
*/ */
public function renderIndicators() public function renderIndicators()
{ {
ob_start(); $indicators = array();
echo Html::beginTag('ol', array('class' => 'carousel-indicators')) . "\n"; for ($i = 0, $count = count($this->items); $i < $count; $i++) {
for ($i = 0, $ln = count($this->items); $i < $ln; $i++) {
$options = array('data-target' => '#' . $this->options['id'], 'data-slide-to' => $i); $options = array('data-target' => '#' . $this->options['id'], 'data-slide-to' => $i);
if ($i === 0) { if ($i === 0) {
$this->addCssClass($options, 'active'); $this->addCssClass($options, 'active');
} }
echo Html::tag('li', '', $options) . "\n"; $indicators[] = Html::tag('li', '', $options);
} }
echo Html::endTag('ol') . "\n"; return Html::tag('ol', implode("\n", $indicators), array('class' => 'carousel-indicators'));
return ob_get_clean();
} }
/** /**
* Renders carousel items as specified on [[items]] * Renders carousel items as specified on [[items]].
* @return string the rendering result
*/ */
public function renderItems() public function renderItems()
{ {
ob_start(); $items = array();
echo Html::beginTag('div', array('class' => 'carousel-inner')) . "\n"; for ($i = 0, $count = count($this->items); $i < $count; $i++) {
for ($i = 0, $ln = count($this->items); $i < $ln; $i++) { $items[] = $this->renderItem($this->items[$i], $i);
$this->renderItem($this->items[$i], $i);
} }
echo Html::endTag('div') . "\n"; return Html::tag('div', implode("\n", $items), array('class' => 'carousel-inner'));
return ob_get_clean();
} }
/** /**
* Renders a single carousel item * Renders a single carousel item
* @param mixed $item a single item from [[items]] * @param string|array $item a single item from [[items]]
* @param integer $index the item index as the first item should be set to `active` * @param integer $index the item index as the first item should be set to `active`
* @return string the rendering result
* @throws InvalidConfigException if the item is invalid
*/ */
public function renderItem($item, $index) public function renderItem($item, $index)
{ {
if (is_string($item)) { if (is_string($item)) {
$itemOptions = array(); $content = $item;
$itemContent = $item; $caption = null;
$itemCaption = ''; $options = array();
} else { } elseif (isset($item['content'])) {
$itemOptions = ArrayHelper::getValue($item, 'options', array()); $content = $item['content'];
$itemContent = $item['content']; // if not string, must be array, force required key $caption = ArrayHelper::getValue($item, 'caption');
$itemCaption = ArrayHelper::getValue($item, 'caption'); if ($caption !== null) {
if ($itemCaption) { $caption = Html::tag('div', $caption, array('class' => 'carousel-caption'));
$itemCaption = Html::tag('div', $itemCaption, array('class' => 'carousel-caption'));
} }
$options = ArrayHelper::getValue($item, 'options', array());
} else {
throw new InvalidConfigException('The "content" option is required.');
} }
$this->addCssClass($itemOptions, 'item'); $this->addCssClass($options, 'item');
if ($index === 0) { if ($index === 0) {
$this->addCssClass($itemOptions, 'active'); $this->addCssClass($options, 'active');
} }
echo Html::beginTag('div', $itemOptions) . "\n";
echo $itemContent . "\n"; return Html::tag('div', $content . "\n" . $caption, $options);
echo $itemCaption . "\n";
echo Html::endTag('div') . "\n";
} }
/** /**
* Renders previous and next button if [[displayPreviousAndNext]] is set to `true` * Renders previous and next control buttons.
* @throws InvalidConfigException if [[controls]] is invalid.
*/ */
public function renderPreviousAndNext() public function renderControls()
{ {
if ($this->controls === false || !(isset($this->controls['left']) && isset($this->controls['left']))) { if (isset($this->controls[0], $this->controls[1])) {
return; return Html::a($this->controls[0], '#' . $this->options['id'], array(
}
echo Html::a($this->controls['left'], '#' . $this->options['id'], array(
'class' => 'left carousel-control', 'class' => 'left carousel-control',
'data-slide' => 'prev' 'data-slide' => 'prev',
)) . )) . "\n"
"\n" . . Html::a($this->controls[1], '#' . $this->options['id'], array(
Html::a($this->controls['right'], '#' . $this->options['id'], array(
'class' => 'right carousel-control', 'class' => 'right carousel-control',
'data-slide' => 'next' 'data-slide' => 'next',
)); ));
} elseif ($this->controls === false) {
return '';
} else {
throw new InvalidConfigException('The "controls" property must be either false or an array of two elements.');
}
} }
} }
\ No newline at end of file
<?php
/**
* @link http://www.yiiframework.com/
* @copyright Copyright (c) 2008 Yii Software LLC
* @license http://www.yiiframework.com/license/
*/
namespace yii\bootstrap;
use yii\base\InvalidConfigException;
use yii\helpers\base\ArrayHelper;
use yii\helpers\Html;
/**
* Collapse renders an accordion bootstrap javascript component.
*
* For example:
*
* ```php
* echo Collapse::widget(array(
* 'items' => array(
* // equivalent to the above
* 'Collapsible Group Item #1' => array(
* 'content' => 'Anim pariatur cliche...',
* // open its content by default
* 'contentOptions' => array('class'=>'in')
* ),
* // another group item
* 'Collapsible Group Item #2' => array(
* 'content' => 'Anim pariatur cliche...',
* 'contentOptions' => array(...),
* 'options' => array(...),
* ),
* )
* ));
* ```
*
* @see http://twitter.github.io/bootstrap/javascript.html#collapse
* @author Antonio Ramirez <amigo.cobos@gmail.com>
* @since 2.0
*/
class Collapse extends Widget
{
/**
* @var array list of groups in the collapse widget. Each array element represents a single
* group with the following structure:
*
* ```php
* // item key is the actual group header
* 'Collapsible Group Item #1' => array(
* // required, the content (HTML) of the group
* 'content' => 'Anim pariatur cliche...',
* // optional the HTML attributes of the content group
* 'contentOptions'=> array(),
* // optional the HTML attributes of the group
* 'options'=> array(),
* )
* ```
*/
public $items = array();
/**
* Initializes the widget.
*/
public function init()
{
parent::init();
$this->addCssClass($this->options, 'accordion');
}
/**
* Renders the widget.
*/
public function run()
{
echo Html::beginTag('div', $this->options) . "\n";
echo $this->renderItems() . "\n";
echo Html::endTag('div') . "\n";
$this->registerPlugin('collapse');
}
/**
* Renders collapsible items as specified on [[items]].
* @return string the rendering result
*/
public function renderItems()
{
$items = array();
$index = 0;
foreach ($this->items as $header => $item) {
$options = ArrayHelper::getValue($item, 'options', array());
$this->addCssClass($options, 'accordion-group');
$items[] = Html::tag('div', $this->renderItem($header, $item, ++$index), $options);
}
return implode("\n", $items);
}
/**
* Renders a single collapsible item group
* @param string $header a label of the item group [[items]]
* @param array $item a single item from [[items]]
* @param integer $index the item index as each item group content must have an id
* @return string the rendering result
* @throws InvalidConfigException
*/
public function renderItem($header, $item, $index)
{
if (isset($item['content'])) {
$id = $this->options['id'] . '-collapse' . $index;
$options = ArrayHelper::getValue($item, 'contentOptions', array());
$options['id'] = $id;
$this->addCssClass($options, 'accordion-body collapse');
$header = Html::a($header, '#' . $id, array(
'class' => 'accordion-toggle',
'data-toggle' => 'collapse',
'data-parent' => '#' . $this->options['id']
)) . "\n";
$content = Html::tag('div', $item['content'], array('class' => 'accordion-inner')) . "\n";
} else {
throw new InvalidConfigException('The "content" option is required.');
}
$group = array();
$group[] = Html::tag('div', $header, array('class' => 'accordion-heading'));
$group[] = Html::tag('div', $content, $options);
return implode("\n", $group);
}
}
\ No newline at end of file
...@@ -15,9 +15,32 @@ class Request extends \yii\base\Request ...@@ -15,9 +15,32 @@ class Request extends \yii\base\Request
{ {
const ANONYMOUS_PARAMS = '-args'; const ANONYMOUS_PARAMS = '-args';
public function getRawParams() private $_params;
/**
* Returns the command line arguments.
* @return array the command line arguments. It does not include the entry script name.
*/
public function getParams()
{
if (!isset($this->_params)) {
if (isset($_SERVER['argv'])) {
$this->_params = $_SERVER['argv'];
array_shift($this->_params);
} else {
$this->_params = array();
}
}
return $this->_params;
}
/**
* Sets the command line arguments.
* @param array $params the command line arguments
*/
public function setParams($params)
{ {
return isset($_SERVER['argv']) ? $_SERVER['argv'] : array(); $this->_params = $params;
} }
/** /**
...@@ -26,9 +49,7 @@ class Request extends \yii\base\Request ...@@ -26,9 +49,7 @@ class Request extends \yii\base\Request
*/ */
public function resolve() public function resolve()
{ {
$rawParams = $this->getRawParams(); $rawParams = $this->getParams();
array_shift($rawParams); // the 1st argument is the yii script name
if (isset($rawParams[0])) { if (isset($rawParams[0])) {
$route = $rawParams[0]; $route = $rawParams[0];
array_shift($rawParams); array_shift($rawParams);
......
...@@ -775,7 +775,7 @@ return array( ...@@ -775,7 +775,7 @@ return array(
'css' => array( 'css' => array(
'themes/base/jquery.ui.autocomplete.css', 'themes/base/jquery.ui.autocomplete.css',
), ),
'depends' => array('yii/jui/theme/base/core'), 'depends' => array('yii/jui/theme/base/core', 'yii/jui/theme/base/menu'),
), ),
'yii/jui/theme/base/button' => array( 'yii/jui/theme/base/button' => array(
'sourcePath' => __DIR__ . '/assets', 'sourcePath' => __DIR__ . '/assets',
...@@ -796,7 +796,7 @@ return array( ...@@ -796,7 +796,7 @@ return array(
'css' => array( 'css' => array(
'themes/base/jquery.ui.dialog.css', 'themes/base/jquery.ui.dialog.css',
), ),
'depends' => array('yii/jui/theme/base/core'), 'depends' => array('yii/jui/theme/base/core', 'yii/jui/theme/base/button', 'yii/jui/theme/base/resizeable'),
), ),
'yii/jui/theme/base/menu' => array( 'yii/jui/theme/base/menu' => array(
'sourcePath' => __DIR__ . '/assets', 'sourcePath' => __DIR__ . '/assets',
...@@ -838,7 +838,7 @@ return array( ...@@ -838,7 +838,7 @@ return array(
'css' => array( 'css' => array(
'themes/base/jquery.ui.spinner.css', 'themes/base/jquery.ui.spinner.css',
), ),
'depends' => array('yii/jui/theme/base/core'), 'depends' => array('yii/jui/theme/base/core', 'yii/jui/theme/base/button'),
), ),
'yii/jui/theme/base/tabs' => array( 'yii/jui/theme/base/tabs' => array(
'sourcePath' => __DIR__ . '/assets', 'sourcePath' => __DIR__ . '/assets',
......
...@@ -9,9 +9,9 @@ return array( ...@@ -9,9 +9,9 @@ return array(
array( array(
'name' => 'PHP version', 'name' => 'PHP version',
'mandatory' => true, 'mandatory' => true,
'condition' => version_compare(PHP_VERSION, '5.3.11', '>='), 'condition' => version_compare(PHP_VERSION, '5.3.7', '>='),
'by' => '<a href="http://www.yiiframework.com">Yii Framework</a>', 'by' => '<a href="http://www.yiiframework.com">Yii Framework</a>',
'memo' => 'PHP 5.3.11 or higher is required.', 'memo' => 'PHP 5.3.7 or higher is required.',
), ),
array( array(
'name' => 'Reflection extension', 'name' => 'Reflection extension',
......
...@@ -27,6 +27,12 @@ class UrlManager extends Component ...@@ -27,6 +27,12 @@ class UrlManager extends Component
*/ */
public $enablePrettyUrl = false; public $enablePrettyUrl = false;
/** /**
* @var boolean whether to enable strict parsing. If strict parsing is enabled, the incoming
* requested URL must match at least one of the [[rules]] in order to be treated as a valid request.
* This property is used only when [[enablePrettyUrl]] is true.
*/
public $enableStrictParsing = false;
/**
* @var array the rules for creating and parsing URLs when [[enablePrettyUrl]] is true. * @var array the rules for creating and parsing URLs when [[enablePrettyUrl]] is true.
* This property is used only if [[enablePrettyUrl]] is true. Each element in the array * This property is used only if [[enablePrettyUrl]] is true. Each element in the array
* is the configuration array for creating a single URL rule. The configuration will * is the configuration array for creating a single URL rule. The configuration will
...@@ -139,6 +145,10 @@ class UrlManager extends Component ...@@ -139,6 +145,10 @@ class UrlManager extends Component
} }
} }
if ($this->enableStrictParsing) {
return false;
}
$suffix = (string)$this->suffix; $suffix = (string)$this->suffix;
if ($suffix !== '' && $suffix !== '/' && $pathInfo !== '') { if ($suffix !== '' && $suffix !== '/' && $pathInfo !== '') {
$n = strlen($this->suffix); $n = strlen($this->suffix);
......
...@@ -26,7 +26,6 @@ use yii\helpers\Html; ...@@ -26,7 +26,6 @@ use yii\helpers\Html;
* The following example shows how to use Menu: * The following example shows how to use Menu:
* *
* ~~~ * ~~~
* // $this is the view object currently being used
* echo Menu::widget(array( * echo Menu::widget(array(
* 'items' => array( * 'items' => array(
* // Important: you need to specify url as 'controller/action', * // Important: you need to specify url as 'controller/action',
......
...@@ -8,8 +8,6 @@ use yiiunit\TestCase; ...@@ -8,8 +8,6 @@ use yiiunit\TestCase;
class InflectorTest extends TestCase class InflectorTest extends TestCase
{ {
public function testPluralize() public function testPluralize()
{ {
$testData = array( $testData = array(
......
...@@ -224,5 +224,27 @@ class UrlManagerTest extends \yiiunit\TestCase ...@@ -224,5 +224,27 @@ class UrlManagerTest extends \yiiunit\TestCase
$request->pathInfo = 'site/index'; $request->pathInfo = 'site/index';
$result = $manager->parseRequest($request); $result = $manager->parseRequest($request);
$this->assertFalse($result); $this->assertFalse($result);
// strict parsing
$manager = new UrlManager(array(
'enablePrettyUrl' => true,
'enableStrictParsing' => true,
'suffix' => '.html',
'cache' => null,
'rules' => array(
array(
'pattern' => 'post/<id>/<title>',
'route' => 'post/view',
),
),
));
// matching pathinfo
$request->pathInfo = 'post/123/this+is+sample.html';
$result = $manager->parseRequest($request);
$this->assertEquals(array('post/view', array('id' => '123', 'title' => 'this+is+sample')), $result);
// unmatching pathinfo
$request->pathInfo = 'site/index.html';
$result = $manager->parseRequest($request);
$this->assertFalse($result);
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment