Skip to content

Commit

Permalink
csfixed
Browse files Browse the repository at this point in the history
  • Loading branch information
hiqsol committed May 13, 2017
1 parent 3a10077 commit 24e20a6
Show file tree
Hide file tree
Showing 22 changed files with 58 additions and 45 deletions.
23 changes: 13 additions & 10 deletions .gitignore
@@ -1,8 +1,12 @@
# hidev internals
.hidev/composer.json
.hidev/composer.lock
.hidev/config-local.yml
.hidev/vendor
/.hidev/composer.json
/.hidev/composer.lock
/.hidev/runtime
/.hidev/vendor

# local config
/.env
/hidev-local.yml

# IDE & OS files
.*.swp
Expand All @@ -14,21 +18,20 @@
Thumbs.db
nbproject

# vendor dirs
vendor

# composer lock files
composer.lock
# composer internals
/composer.lock
/vendor

# php-cs-fixer cache
.php_cs.cache

# phpunit generated files
coverage.clover

# PHARs
# Binaries
chkipper.phar
composer.phar
ocular.phar
php-cs-fixer.phar
phpunit-skelgen.phar
phpunit.phar
5 changes: 2 additions & 3 deletions .php_cs
@@ -1,7 +1,7 @@
<?php

$header = <<<EOF
AdminLte Theme for hiqdev/yii2-thememanager
AdminLte Theme for Yii2 projects
@link https://github.com/hiqdev/yii2-theme-adminlte
@package yii2-theme-adminlte
Expand All @@ -26,10 +26,9 @@ return PhpCsFixer\Config::create()
],
'concat_space' => ['spacing' => 'one'],
'array_syntax' => ['syntax' => 'short'],
'empty_return' => false,
'phpdoc_no_alias_tag' => ['replacements' => ['type' => 'var']],
'blank_line_before_return' => false,
'phpdoc_align' => false,
'phpdoc_params' => false,
'phpdoc_scalar' => false,
'phpdoc_separation' => false,
'phpdoc_to_comment' => false,
Expand Down
9 changes: 4 additions & 5 deletions .travis.yml
@@ -1,15 +1,14 @@
language: php
php:
- 5.5
- 5.6
- 7
- 7.1
- hhvm
dist: trusty
matrix:
allow_failures:
-
php: hhvm
-
php: 5.5
cache:
directories:
- $HOME/.composer/cache
Expand All @@ -18,11 +17,11 @@ before_install:
- 'composer --version'
- 'wget http://hiqdev.com/hidev/hidev.phar -O hidev.phar && chmod a+x hidev.phar'
- './hidev.phar --version'
- './hidev.phar travis/before_install'
- './hidev.phar travis/before-install'
sudo: false
install:
- './hidev.phar travis/install'
script:
- './hidev.phar travis/script'
after_script:
- './hidev.phar travis/after_script'
- './hidev.phar travis/after-script'
13 changes: 10 additions & 3 deletions README.md
@@ -1,7 +1,6 @@
Yii2 AdminLte Theme
===================
# Yii2 AdminLte Theme

**AdminLte Theme for hiqdev/yii2-thememanager**
**AdminLte Theme for Yii2 projects**

[![Latest Stable Version](https://poser.pugx.org/hiqdev/yii2-theme-adminlte/v/stable)](https://packagist.org/packages/hiqdev/yii2-theme-adminlte)
[![Total Downloads](https://poser.pugx.org/hiqdev/yii2-theme-adminlte/downloads)](https://packagist.org/packages/hiqdev/yii2-theme-adminlte)
Expand All @@ -10,6 +9,14 @@ Yii2 AdminLte Theme
[![Scrutinizer Code Quality](https://img.shields.io/scrutinizer/g/hiqdev/yii2-theme-adminlte.svg)](https://scrutinizer-ci.com/g/hiqdev/yii2-theme-adminlte/)
[![Dependency Status](https://www.versioneye.com/php/hiqdev:yii2-theme-adminlte/dev-master/badge.svg)](https://www.versioneye.com/php/hiqdev:yii2-theme-adminlte/dev-master)

This package provides pluggable [AdminLte] theme for [Yii2] projects.

This package uses [hiqdev/yii2-thememanager] theming library.

[yii2]: http://www.yiiframework.com/
[adminlte]: https://almsaeedstudio.com/preview
[hiqdev/yii2-thememanager]: https://github.com/hiqdev/yii2-thememanager

## Installation

The preferred way to install this yii2-extension is through [composer](http://getcomposer.org/download/).
Expand Down
8 changes: 4 additions & 4 deletions composer.json
@@ -1,7 +1,7 @@
{
"name": "hiqdev/yii2-theme-adminlte",
"type": "yii2-extension",
"description": "AdminLte Theme for hiqdev/yii2-thememanager",
"description": "AdminLte Theme for Yii2 projects",
"keywords": [
"adminlte",
"theme",
Expand All @@ -27,19 +27,19 @@
{
"name": "Dmitry Naumenko",
"role": "Lead backend developer",
"email": "silverfire@hiqdev.com",
"email": "d.naumenko.a@gmail.com",
"homepage": "http://silverfire.me/"
},
{
"name": "Andrey Klochok",
"role": "Lead frontend developer",
"email": "tafid@hiqdev.com",
"email": "andreyklochok@gmail.com",
"homepage": "http://hiqdev.com/"
},
{
"name": "Yuriy Myronchuk",
"role": "QA Lead",
"email": "bladeroot@hiqdev.com",
"email": "bladeroot@gmail.com",
"homepage": "http://hiqdev.com/"
}
],
Expand Down
11 changes: 9 additions & 2 deletions hidev.yml
@@ -1,7 +1,14 @@
package:
type: yii2-extension
name: yii2-theme-adminlte
title: AdminLte Theme for hiqdev/yii2-thememanager
title: AdminLte Theme for Yii2 projects
headline: Yii2 AdminLte Theme
keywords: adminlte, theme, extension, yii2
namespace: hiqdev\themes\adminlte
description: |
This package provides pluggable [AdminLte] theme for [Yii2] projects.
This package uses [hiqdev/yii2-thememanager] theming library.
[yii2]: http://www.yiiframework.com/
[adminlte]: https://almsaeedstudio.com/preview
[hiqdev/yii2-thememanager]: https://github.com/hiqdev/yii2-thememanager
2 changes: 1 addition & 1 deletion src/AdminLteTheme.php
@@ -1,6 +1,6 @@
<?php
/**
* AdminLte Theme for hiqdev/yii2-thememanager
* AdminLte Theme for Yii2 projects
*
* @link https://github.com/hiqdev/yii2-theme-adminlte
* @package yii2-theme-adminlte
Expand Down
2 changes: 1 addition & 1 deletion src/MainAsset.php
@@ -1,6 +1,6 @@
<?php
/**
* AdminLte Theme for hiqdev/yii2-thememanager
* AdminLte Theme for Yii2 projects
*
* @link https://github.com/hiqdev/yii2-theme-adminlte
* @package yii2-theme-adminlte
Expand Down
2 changes: 1 addition & 1 deletion src/MiniAsset.php
@@ -1,6 +1,6 @@
<?php
/**
* AdminLte Theme for hiqdev/yii2-thememanager
* AdminLte Theme for Yii2 projects
*
* @link https://github.com/hiqdev/yii2-theme-adminlte
* @package yii2-theme-adminlte
Expand Down
2 changes: 1 addition & 1 deletion src/config/hisite.php
@@ -1,6 +1,6 @@
<?php
/**
* AdminLte Theme for hiqdev/yii2-thememanager
* AdminLte Theme for Yii2 projects
*
* @link https://github.com/hiqdev/yii2-theme-adminlte
* @package yii2-theme-adminlte
Expand Down
2 changes: 1 addition & 1 deletion src/config/i18n.php
@@ -1,6 +1,6 @@
<?php
/**
* AdminLte Theme for hiqdev/yii2-thememanager
* AdminLte Theme for Yii2 projects
*
* @link https://github.com/hiqdev/yii2-theme-adminlte
* @package yii2-theme-adminlte
Expand Down
2 changes: 1 addition & 1 deletion src/config/params.php
@@ -1,6 +1,6 @@
<?php
/**
* AdminLte Theme for hiqdev/yii2-thememanager
* AdminLte Theme for Yii2 projects
*
* @link https://github.com/hiqdev/yii2-theme-adminlte
* @package yii2-theme-adminlte
Expand Down
2 changes: 1 addition & 1 deletion src/messages/ru/adminlte.php
@@ -1,6 +1,6 @@
<?php
/**
* AdminLte Theme for hiqdev/yii2-thememanager
* AdminLte Theme for Yii2 projects
*
* @link https://github.com/hiqdev/yii2-theme-adminlte
* @package yii2-theme-adminlte
Expand Down
2 changes: 1 addition & 1 deletion src/models/Settings.php
@@ -1,6 +1,6 @@
<?php
/**
* AdminLte Theme for hiqdev/yii2-thememanager
* AdminLte Theme for Yii2 projects
*
* @link https://github.com/hiqdev/yii2-theme-adminlte
* @package yii2-theme-adminlte
Expand Down
4 changes: 2 additions & 2 deletions src/views/layouts/_sidebar.php
Expand Up @@ -3,13 +3,13 @@
use hiqdev\thememanager\menus\AbstractSidebarMenu;
use yii\helpers\Url;

$this->registerCss("
$this->registerCss('
.user-panel > .image img {
width: 100%;
max-width: 45px;
height: auto;
}
");
');

?>
<!-- Left side column. contains the sidebar -->
Expand Down
2 changes: 1 addition & 1 deletion src/views/layouts/gravatar.php
@@ -1,6 +1,6 @@
<?php
/**
* AdminLte Theme for hiqdev/yii2-thememanager
* AdminLte Theme for Yii2 projects
*
* @link https://github.com/hiqdev/yii2-theme-adminlte
* @package yii2-theme-adminlte
Expand Down
1 change: 0 additions & 1 deletion src/views/widgets/LanguageMenu-mini.php
@@ -1,7 +1,6 @@
<?php

/** @var array $items */

use yii\helpers\Html;
use yii\helpers\Url;

Expand Down
1 change: 0 additions & 1 deletion src/views/widgets/faq/node.php
Expand Up @@ -3,7 +3,6 @@
/** @var string $parentId */
/** @var string $itemId */
/** @var array $item */

use yii\helpers\Html;

?>
Expand Down
4 changes: 2 additions & 2 deletions src/views/widgets/faq/root.php
Expand Up @@ -5,11 +5,11 @@
/** @var array $items */
/** @var \yii\web\View $this */
/** @var \hipanel\faq\widgets\Faq $this ->context */
$this->registerCss("
$this->registerCss('
#faq .box.box-solid > .box-header a:hover {
background: none;
}
");
');

?>
<div id="faq" class="nav-tabs-custom faq-categories">
Expand Down
2 changes: 1 addition & 1 deletion src/widgets/Gravatar.php
@@ -1,6 +1,6 @@
<?php
/**
* AdminLte Theme for hiqdev/yii2-thememanager
* AdminLte Theme for Yii2 projects
*
* @link https://github.com/hiqdev/yii2-theme-adminlte
* @package yii2-theme-adminlte
Expand Down
2 changes: 1 addition & 1 deletion src/widgets/SidebarMenu.php
@@ -1,6 +1,6 @@
<?php
/**
* AdminLte Theme for hiqdev/yii2-thememanager
* AdminLte Theme for Yii2 projects
*
* @link https://github.com/hiqdev/yii2-theme-adminlte
* @package yii2-theme-adminlte
Expand Down
2 changes: 1 addition & 1 deletion tests/_bootstrap.php
@@ -1,6 +1,6 @@
<?php
/**
* AdminLte Theme for hiqdev/yii2-thememanager
* AdminLte Theme for Yii2 projects
*
* @link https://github.com/hiqdev/yii2-theme-adminlte
* @package yii2-theme-adminlte
Expand Down

0 comments on commit 24e20a6

Please sign in to comment.