Skip to content

Commit

Permalink
Merge branch 'fix'
Browse files Browse the repository at this point in the history
  • Loading branch information
tangrufus committed Apr 25, 2017
2 parents c10bbd1 + e0d3d5a commit 0330c35
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 14 deletions.
3 changes: 3 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,9 @@ after_script:
- if [[ "$WITH_COVERAGE" == "true" ]]; then travis_retry tnw-upload-coverage-to-scrutinizer; fi
- if [[ "$WITH_COVERAGE" == "true" ]]; then travis_retry tnw-upload-coverage-to-codecov; fi

before_deploy:
- unzip -qo release/wp-better-settings.zip -d build

deploy:
- provider: releases
api_key:
Expand Down
2 changes: 1 addition & 1 deletion src/Factories/Fields/AbstractFieldFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public function __construct(OptionStore $optionStore)
*
* @param string $id ID of this field. Should be unique for each section/page.
* @param string $title Title of the field.
* @param array $args Configuration for this Fields\Checkbox and its decorator.
* @param array $args Configuration for this AbstractField and its decorator.
*
* @return AbstractField
*/
Expand Down
1 change: 0 additions & 1 deletion src/SettingRegister.php
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,6 @@ private function registerSection(Section $section)
*/
private function registerField(Field $field, string $page)
{
// TODO: Move setValue out of this class.
$field->getDecorator()
->setValue($this->optionStore->get(
$field->getId()
Expand Down
14 changes: 6 additions & 8 deletions src/Views/View.php
Original file line number Diff line number Diff line change
Expand Up @@ -42,17 +42,15 @@ final class View implements ViewInterface
/**
* View constructor.
*
* @param string $filename Filename of the PHP view to render.
* @param array $allowedTags [Optional] Array of allowed tags to
* let through escaping functions. Set
* to sane defaults if none provided.
* @param string $filename Filename of the PHP view to render.
* @param array|null $allowedTags Optional. Array of allowed tags to
* let through escaping functions. Set
* to sane defaults if none provided.
*/
public function __construct(string $filename, array $allowedTags = [])
public function __construct(string $filename, array $allowedTags = null)
{
$this->filename = $filename;
$this->allowedTags = empty($allowedTags)
? $this->defaultAllowedTags()
: $allowedTags;
$this->allowedTags = $allowedTags ?? $this->defaultAllowedTags();
}

/**
Expand Down
2 changes: 1 addition & 1 deletion src/partials/basic-page.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

namespace TypistTech\WPBetterSettings;

/* @var Decorators\Page $context */
/* @var Decorators\Pages\TabbedPageInterface $context Context */

echo '<div class="wrap">';

Expand Down
2 changes: 1 addition & 1 deletion src/partials/options-form.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

namespace TypistTech\WPBetterSettings;

/* @var Decorators\Page $context */
/* @var Decorators\Pages\TabbedPageInterface $context Context*/

settings_errors();

Expand Down
2 changes: 1 addition & 1 deletion src/partials/section.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

namespace TypistTech\WPBetterSettings;

/* @var \TypistTech\WPBetterSettings\Decorators\Section $context Context */
/* @var Decorators\Section $context Context */

do_action($context->getSnakecasedMenuSlug() . '_before_section_content');

Expand Down
2 changes: 1 addition & 1 deletion src/partials/tabbed-page.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

namespace TypistTech\WPBetterSettings;

/* @var Decorators\Page $context */
/* @var Decorators\Pages\TabbedPageInterface $context Context */

echo '<div class="wrap">';

Expand Down

0 comments on commit 0330c35

Please sign in to comment.