diff --git a/.coveralls.yml b/.coveralls.yml deleted file mode 100644 index ab375e62aba..00000000000 --- a/.coveralls.yml +++ /dev/null @@ -1,4 +0,0 @@ -# for php-coveralls -#src_dir: src -coverage_clover: coverage.clover -json_path: coveralls-upload.json \ No newline at end of file diff --git a/.env.dist b/.env.dist index fef8b909292..f5ea3472a75 100644 --- a/.env.dist +++ b/.env.dist @@ -41,6 +41,7 @@ MAILER_URL=null://localhost #ECCUBE_ADMIN_ROUTE=admin #ECCUBE_USER_DATA_ROUTE=user_data #ECCUBE_ADMIN_ALLOW_HOSTS=[] +#ECCUBE_ADMIN_DENY_HOSTS=[] #ECCUBE_FORCE_SSL=false #ECCUBE_TEMPLATE_CODE=default #ECCUBE_AUTH_MAGIC= diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml new file mode 100644 index 00000000000..c5ab68b2adb --- /dev/null +++ b/.github/workflows/coverage.yml @@ -0,0 +1,89 @@ +name: Coverage +on: + push: + branches: + - '*' + tags: + - '*' + paths: + - '**' + - '!*.md' + pull_request: + paths: + - '**' + - '!*.md' +jobs: + phpunit: + name: PHPUnit + runs-on: ${{ matrix.operating-system }} + strategy: + fail-fast: false + matrix: + operating-system: [ ubuntu-18.04 ] + php: [ 7.4 ] + db: [ pgsql ] + include: + - db: pgsql + database_url: postgres://postgres:password@127.0.0.1:5432/eccube_db + database_server_version: 11 + services: + postgres: + image: postgres:11 + env: + POSTGRES_USER: postgres + POSTGRES_PASSWORD: password + ports: + - 5432:5432 + # needed because the postgres container does not provide a healthcheck + options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5 + + steps: + - name: Checkout + uses: actions/checkout@master + + - name: Get Composer Cache Directory + id: composer-cache + run: | + echo "::set-output name=dir::$(composer config cache-files-dir)" + - uses: actions/cache@v1 + with: + path: ${{ steps.composer-cache.outputs.dir }} + key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} + restore-keys: | + ${{ runner.os }}-composer- + + - name: Setup PHP + uses: nanasess/setup-php@master + with: + php-version: ${{ matrix.php }} + + - name: composer install + run: composer install --dev --no-interaction -o --apcu-autoloader + + - name: Setup EC-CUBE + env: + DATABASE_URL: ${{ matrix.database_url }} + DATABASE_SERVER_VERSION: ${{ matrix.database_server_version }} + run: | + bin/console doctrine:database:create + bin/console doctrine:schema:create + bin/console eccube:fixtures:load + + - name: PHPUnit + env: + APP_ENV: 'test' + DATABASE_URL: ${{ matrix.database_url }} + DATABASE_SERVER_VERSION: ${{ matrix.database_server_version }} + MAILER_URL: 'smtp://localhost:1025' + continue-on-error: true + run: | + bin/phpunit --version + phpdbg -dmemory_limit=-1 -qrr bin/phpunit --exclude-group cache-clear,cache-clear-install,update-schema-doctrine --coverage-clover=coverage1.xml + - name: Upload coverage + uses: codecov/codecov-action@v1 + with: + files: ./coverage1.xml + # token: ${{ secrets.CODECOV_TOKEN }} + flags: tests + # yml: ./codecov.yml + fail_ci_if_error: true diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 2d3f99e4e1a..0433990859a 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -77,23 +77,21 @@ jobs: rm -rf $GITHUB_WORKSPACE/.gitignore rm -rf $GITHUB_WORKSPACE/.buildpath rm -rf $GITHUB_WORKSPACE/.gitmodules - rm -rf $GITHUB_WORKSPACE/.scrutinizer.yml - rm -rf $GITHUB_WORKSPACE/.travis.yml - rm -rf $GITHUB_WORKSPACE/appveyor.yml - rm -rf $GITHUB_WORKSPACE/.coveralls.yml rm -rf $GITHUB_WORKSPACE/.php_cs.dist rm -rf $GITHUB_WORKSPACE/phpunit.xml.dist + rm -rf $GITHUB_WORKSPACE/phpstan.neon.dist rm -rf $GITHUB_WORKSPACE/app.json rm -rf $GITHUB_WORKSPACE/Procfile rm -rf $GITHUB_WORKSPACE/LICENSE.txt rm -rf $GITHUB_WORKSPACE/README.md - rm -rf $GITHUB_WORKSPACE/codeception.sh rm -rf $GITHUB_WORKSPACE/codeception.yml rm -rf $GITHUB_WORKSPACE/var/* rm -rf $GITHUB_WORKSPACE/.env rm -rf $GITHUB_WORKSPACE/codeception rm -rf $GITHUB_WORKSPACE/tests rm -rf $GITHUB_WORKSPACE/.github + rm -rf $GITHUB_WORKSPACE/zap + rm -rf $GITHUB_WORKSPACE/docker-compose-owaspzap.yml find $GITHUB_WORKSPACE -name "dummy" -print0 | xargs -0 rm -rf find $GITHUB_WORKSPACE -name ".git*" -and ! -name ".gitkeep" -print0 | xargs -0 rm -rf find $GITHUB_WORKSPACE -name ".git*" -type d -print0 | xargs -0 rm -rf diff --git a/.github/workflows/e2e-bc-test.yml b/.github/workflows/e2e-bc-test.yml new file mode 100644 index 00000000000..a1319377c55 --- /dev/null +++ b/.github/workflows/e2e-bc-test.yml @@ -0,0 +1,134 @@ +name: Backward compatibility testing to Front template +on: + push: + branches: + - '*' + tags: + - '*' + paths: + - '**' + - '!*.md' + pull_request: + paths: + - '**' + - '!*.md' +jobs: + codeception: + name: Codeception + runs-on: ${{ matrix.operating-system }} + strategy: + fail-fast: false + matrix: + version: [ 4.0.0, 4.0.1, 4.0.2, 4.0.3, 4.0.4, 4.0.5 ] + operating-system: [ ubuntu-18.04 ] + php: [ 7.3 ] + db: [ pgsql ] + group: [ front ] + include: + - db: pgsql + database_url: postgres://postgres:password@127.0.0.1:5432/eccube_db + database_server_version: 11 + - group: front + app_env: 'codeception' + + services: + postgres: + image: postgres:11 + env: + POSTGRES_USER: postgres + POSTGRES_PASSWORD: password + ports: + - 5432:5432 + # needed because the postgres container does not provide a healthcheck + options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5 + + mailcatcher: + image: schickling/mailcatcher + ports: + - 1080:1080 + - 1025:1025 + + steps: + - name: Checkout + uses: actions/checkout@master + + - name: Checkout to front templates + env: + ECCUBE_VERSION: ${{ matrix.version }} + run: | + git remote add upstream https://github.com/EC-CUBE/ec-cube.git + git fetch upstream --tags + git checkout refs/tags/${ECCUBE_VERSION} src/Eccube/Resource/template/default + git checkout refs/tags/${ECCUBE_VERSION} html/template/default + + - name: Get Composer Cache Directory + id: composer-cache + run: | + echo "::set-output name=dir::$(composer config cache-files-dir)" + - uses: actions/cache@v1 + with: + path: ${{ steps.composer-cache.outputs.dir }} + key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} + restore-keys: | + ${{ runner.os }}-composer- + + - name: Setup PHP + uses: nanasess/setup-php@master + with: + php-version: ${{ matrix.php }} + + - name: composer install + run: composer install --dev --no-interaction -o --apcu-autoloader + - name: Setup to EC-CUBE + env: + APP_ENV: ${{ matrix.app_env }} + DATABASE_URL: ${{ matrix.database_url }} + DATABASE_SERVER_VERSION: ${{ matrix.database_server_version }} + run: | + echo "APP_ENV=${APP_ENV}" > .env + bin/console doctrine:database:create --env=dev + bin/console doctrine:schema:create --env=dev + bin/console eccube:fixtures:load --env=dev + + - name: setup-chromedriver + uses: nanasess/setup-chromedriver@master + + - name: Run chromedriver + run: | + export DISPLAY=:99 + chromedriver --url-base=/wd/hub & + echo ">>> Started chrome-driver" + sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 & + echo ">>> Started xvfb" + + - name: Start PHP Development Server + env: + APP_ENV: 'codeception' + DATABASE_URL: ${{ matrix.database_url }} + DATABASE_SERVER_VERSION: ${{ matrix.database_server_version }} + MAILER_URL: 'smtp://localhost:1025' + ECCUBE_PACKAGE_API_URL: 'http://localhost:8080' + run: php -S localhost:8000 & + + - name: Codeception + env: + APP_ENV: ${{ matrix.app_env }} + DATABASE_URL: ${{ matrix.database_url }} + DATABASE_SERVER_VERSION: ${{ matrix.database_server_version }} + MAILER_URL: 'smtp://localhost:1025' + ECCUBE_PACKAGE_API_URL: 'http://localhost:8080' + GROUP: ${{ matrix.group }} + SYMFONY_DEPRECATIONS_HELPER: weak + run: vendor/bin/codecept -vvv run acceptance --env chrome,github_action -g ${GROUP} + - name: Upload evidence + if: failure() + uses: actions/upload-artifact@v2 + with: + name: codeception-${{ matrix.group }}-evidence + path: codeception/_output/ + - name: Upload logs + if: failure() + uses: actions/upload-artifact@v2 + with: + name: codeception-${{ matrix.group }}-logs + path: var/log/ diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml new file mode 100644 index 00000000000..72f3b87fc5d --- /dev/null +++ b/.github/workflows/phpstan.yml @@ -0,0 +1,32 @@ +name: PHPStan +on: + push: + branches: + - '*' + tags: + - '*' + paths: + - '**' + - '!*.md' + pull_request: + paths: + - '**' + - '!*.md' + +jobs: + phpstan: + name: PHPStan + + runs-on: ubuntu-latest + + steps: + - name: "Checkout" + uses: actions/checkout@v2 + - name: Setup PHP + uses: nanasess/setup-php@master + with: + php-version: '7.4' + - name: composer install + run: composer install --dev --no-interaction -o --apcu-autoloader + - name: PHPStan + run: vendor/bin/phpstan analyze src/ --error-format=github diff --git a/.github/workflows/plugin-test.yml b/.github/workflows/plugin-test.yml index 76f273817e4..385918acef8 100644 --- a/.github/workflows/plugin-test.yml +++ b/.github/workflows/plugin-test.yml @@ -226,6 +226,7 @@ jobs: - name: Install to Composer run: composer install --dev --no-interaction -o --apcu-autoloader + - name: Setup to EC-CUBE env: APP_ENV: 'codeception' @@ -367,6 +368,7 @@ jobs: - name: Install to Composer run: composer install --dev --no-interaction -o --apcu-autoloader + - name: Setup to EC-CUBE env: APP_ENV: 'codeception' @@ -511,6 +513,7 @@ jobs: - name: Install to Composer run: composer install --dev --no-interaction -o --apcu-autoloader + - name: Setup to EC-CUBE env: APP_ENV: 'codeception' diff --git a/.gitignore b/.gitignore index 7fef6b6d3ab..40847b95770 100644 --- a/.gitignore +++ b/.gitignore @@ -2,41 +2,36 @@ !.gitmodule composer.phar /vendor/ -/node_modules/ +node_modules /var/* !/var/.gitkeep -/app/cache/* -!/app/cache/.gitkeep -/app/log/* -!/app/log/.gitkeep +!/var/.htaccess /app/Plugin/* !/app/Plugin/.gitkeep -!/app/Plugin/ExamplePlugin /app/PluginData/* !/app/PluginData/.gitkeep /app/template/* !/app/template/admin !/app/template/default !/app/template/user_data +!/app/template/smartphone /app/proxy/entity/* !/app/proxy/entity/.gitkeep /html/plugin/* !/html/plugin/.gitkeep -/html/install/temp/* /html/upload/save_image/* !/html/upload/save_image/.gitkeep +!/html/upload/save_image/no_image_product.png /html/upload/temp_image/* !/html/upload/temp_image/.gitkeep -/html/upload/temp_plugin/* /html/template/* !/html/template/admin !/html/template/default !/html/template/install /html/user_data/* +!/html/user_data/.gitkeep !/html/user_data/assets/css/customize.css !/html/user_data/assets/js/customize.js -!/html/user_data/.gitkeep -/src/Eccube/Resource/config/*.dist.php /tests/tmp/* /reports/* .idea @@ -44,6 +39,7 @@ composer.phar *.php~ .env .maintenance +*.neon ###> symfony/phpunit-bridge ### .phpunit diff --git a/.htaccess b/.htaccess index d2c88a117f0..6ba6c6cdcf5 100644 --- a/.htaccess +++ b/.htaccess @@ -10,6 +10,10 @@ DirectoryIndex index.php index.html .ht allow from all + + SetEnvIf Request_URI "\.(jpe?g|png)$" _image_request + + # クリックジャッキング対策 Header always set X-Frame-Options SAMEORIGIN @@ -17,6 +21,9 @@ DirectoryIndex index.php index.html .ht # XSS対策 Header set X-XSS-Protection "1; mode=block" Header set X-Content-Type-Options nosniff + + #webpにvaray + Header append Vary Accept env=_image_request # デザインテンプレートを適用するため10Mで設定 @@ -31,6 +38,12 @@ DirectoryIndex index.php index.html .ht #Options +FollowSymLinks +SymLinksIfOwnerMatch RewriteEngine On + + # Acceptヘッダがimage/webpを含む場合 + RewriteCond %{HTTP_ACCEPT} image/webp + RewriteCond %{SCRIPT_FILENAME}.webp -f + # *.jpg、*.pngファイルを*.webpファイルに内部的にルーティングする + RewriteRule .(jpe?g|png)$ %{SCRIPT_FILENAME}.webp [T=image/webp] # Authorization ヘッダが取得できない環境への対応 RewriteCond %{HTTP:Authorization} ^(.*) @@ -48,11 +61,16 @@ DirectoryIndex index.php index.html .ht RewriteRule "^bin/" - [F] RewriteRule "^dockerbuild/" - [F] RewriteRule "^\.devcontainer/" - [F] + RewriteRule "^zap/" - [F] RewriteCond %{REQUEST_FILENAME} !-f RewriteCond %{REQUEST_FILENAME} !^(.*)\.(gif|png|jpe?g|css|ico|js|svg|map)$ [NC] RewriteRule ^(.*)$ index.php [QSA,L] + + # 拡張子.webpファイルはContent-Typeとしてimage/webpを返す + AddType image/webp .webp + # 管理画面へのBasic認証サンプル # diff --git a/.scrutinizer.yml b/.scrutinizer.yml deleted file mode 100644 index 01b29ce2057..00000000000 --- a/.scrutinizer.yml +++ /dev/null @@ -1,192 +0,0 @@ -#https://scrutinizer-ci.com/docs/configuration/build_status -build_failure_conditions: - # 現実でない部分をコメントアウト - #- 'elements.rating(<= D).exists' # No classes/methods with a rating of D or worse - - 'elements.rating(<= D).new.exists' # No new classes/methods with a rating of D or worse - # allowed (useful for legacy code) - - #- 'issues.label("coding-style").exists' # No coding style issues allowed - #- 'issues.label("coding-style").new.exists' # No new coding style issues allowed - - - 'issues.label("coding-style").new.count > 5' # More than 5 new coding style issues. - - 'issues.severity(>= MAJOR).new.exists' # New issues of major or higher severity - - - 'project.metric("scrutinizer.quality", < 6)' # Code Quality Rating drops below 6 - #- 'project.metric("scrutinizer.test_coverage", < 0.60)' # Code Coverage drops below 60% - - # Code Coverage decreased from previous inspection - #- 'project.metric_change("scrutinizer.test_coverage", < 0)' - - # Code Coverage decreased from previous inspection by more than 10% - # - 'project.metric_change("scrutinizer.test_coverage", < -0.10)' - -filter: - paths: ["src/*", "codeception/*"] - excluded_paths: - - 'app/*' - - 'tests/*' - - 'var/*' - dependency_paths: - - vendor/ -checks: - php: - fix_use_statements: - remove_unused: true - preserve_multiple: false - preserve_blanklines: true - order_alphabetically: true -coding_style: - php: - indentation: - general: - use_tabs: false - size: 4 - switch: - indent_case: true - spaces: - general: - linefeed_character: newline - before_parentheses: - function_declaration: false - closure_definition: true - function_call: false - if: true - for: true - while: true - switch: true - catch: true - array_initializer: false - around_operators: - assignment: true - logical: true - equality: true - relational: true - bitwise: true - additive: true - multiplicative: true - shift: true - unary_additive: false - concatenation: false - negation: false - before_left_brace: - class: true - function: true - if: true - else: true - for: true - while: true - do: true - switch: true - try: true - catch: true - finally: true - before_keywords: - else: true - while: true - catch: true - finally: true - within: - brackets: false - array_initializer: false - grouping: false - function_call: false - function_declaration: false - if: false - for: false - while: false - switch: false - catch: false - type_cast: false - ternary_operator: - before_condition: true - after_condition: true - before_alternative: true - after_alternative: true - in_short_version: false - other: - before_comma: false - after_comma: true - before_semicolon: false - after_semicolon: true - after_type_cast: true - braces: - classes_functions: - class: undefined - function: undefined - closure: undefined - if: - opening: undefined - always: true - else_on_new_line: false - for: - opening: undefined - always: true - while: - opening: undefined - always: true - do_while: - opening: undefined - always: true - while_on_new_line: false - switch: - opening: undefined - try: - opening: undefined - catch_on_new_line: false - finally_on_new_line: false - upper_lower_casing: - keywords: - general: undefined - constants: - true_false_null: undefined - -tools: - # Runs the JSHint static analysis tool (https://scrutinizer-ci.com/docs/tools/javascript/jshint/) - js_hint: - config: - boss: true - curly: true - eqeqeq: true - eqnull: true - es3: true - expr: true - immed: true - noarg: true - onevar: true - quotmark: single - trailing: true - undef: true - unused: true - browser: true - globals: { _: false, Backbone: false, jQuery: false, eccube: false } - - external_code_coverage: false - # runs: 1 - # timeout: 3600 - - #php_code_sniffer: - # enabled: true - # config: - # standard: PSR2 - - php_cpd: - enabled: false - - php_cs_fixer: - enabled: true - config: - level: all - - php_loc: - enabled: true - - php_mess_detector: - enabled: true - - php_pdepend: - enabled: true - - php_analyzer: - enabled: true - - sensiolabs_security_checker: true diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index ae904003b2d..00000000000 --- a/.travis.yml +++ /dev/null @@ -1,422 +0,0 @@ -# for travis-ci -# see also. https://travis-ci.org -dist: xenial -git: - submodules: false - -language: php -services: - - docker - - mysql - - postgresql - - xvfb - -addons: - chrome: stable - -cache: - directories: - - $HOME/.composer/cache - - bin/.phpunit - -php: - - 7.1 - - 7.2 - - 7.3 - - 7.4 - -env: - global: - - SYMFONY_DEPRECATIONS_HELPER=weak - matrix: - - DATABASE_URL=mysql://root:@localhost/cube4_dev DATABASE_SERVER_VERSION=5 - - DATABASE_URL=postgres://postgres:password@localhost/cube4_dev DATABASE_SERVER_VERSION=9 - - DATABASE_URL=sqlite:///var/eccube.db DATABASE_SERVER_VERSION=3 COVERAGE=1 - -matrix: - allow_failures: - - env: DATABASE_URL=sqlite:///var/eccube.db DATABASE_SERVER_VERSION=3 COVERAGE=1 - - env: APP_ENV=codeception - -## see https://github.com/symfony/symfony/blob/e0bdc0c35e9afdb3bee8af172f90e9648c4012fc/.travis.yml#L92-L97 -before_install: &php_setup | - phpenv config-rm xdebug.ini || true - echo "opcache.enable_cli=1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini - echo "extension = apcu.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini - echo "apc.enabled=1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini - echo "apc.enable_cli=1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini - echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini - echo "date.timezone=Asia/Tokyo" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini - -eccube_setup: &eccube_setup | - bin/console doctrine:database:create --env=dev - bin/console doctrine:schema:create --env=dev - bin/console eccube:fixtures:load --env=dev - -package_api_setup: &package_api_setup | - mkdir ${PWD}/repos - docker run -d --rm -v ${PWD}/repos:/repos -e MOCK_REPO_DIR=/repos -p 8080:8080 eccube/mock-package-api:composer2 - -install: - - &composer_install composer install --dev --no-interaction -o --apcu-autoloader - - echo "APP_ENV=test" > .env - - *eccube_setup - -script: - - ./bin/phpunit --exclude-group cache-clear,cache-clear-install,update-schema-doctrine - - ./bin/phpunit --group cache-clear - - ./bin/phpunit --group cache-clear-install - - ./bin/phpunit --group update-schema-doctrine --exclude-group update-schema-doctrine-install - - ./bin/phpunit --group update-schema-doctrine-install --filter=testInstallPluginWithNoProxy - - ./bin/phpunit --group update-schema-doctrine-install --filter=testInstallPluginWithProxy - - ./bin/phpunit --group update-schema-doctrine-install --filter=testEnablePluginWithNoProxy - - ./bin/phpunit --group update-schema-doctrine-install --filter=testEnablePluginWithProxy - - ./bin/phpunit --group update-schema-doctrine-install --filter=testDisablePluginWithNoProxy - - ./bin/phpunit --group update-schema-doctrine-install --filter=testDisablePluginWithProxy - - ./bin/phpunit --group update-schema-doctrine-install --filter=testCreateEntityAndTrait - -jobs: - fast_finish: true - include: - # - &unit_test - # stage: Unit Test - # before_install: - # - *php_setup - # - gem install mailcatcher - # install: - # - *composer_install - # - *eccube_setup - # env: DATABASE_URL=mysql://root:@localhost/cube4_dev DATABASE_SERVER_VERSION=5 - # script: - # - ./bin/phpunit --exclude-group cache-clear,cache-clear-install - # - ./bin/phpunit --group cache-clear - # - ./bin/phpunit --group cache-clear-install - # - <<: *unit_test - # env: DATABASE_URL=postgres://postgres:password@localhost/cube4_dev DATABASE_SERVER_VERSION=9 - - &e2e_test - stage: E2E Test - before_install: - - *php_setup - - wget -c -nc --retry-connrefused --tries=0 http://chromedriver.storage.googleapis.com/2.43/chromedriver_linux64.zip - - unzip -o -q chromedriver_linux64.zip - - docker pull schickling/mailcatcher - - docker run -d -p 1080:1080 -p 1025:1025 --name mailcatcher schickling/mailcatcher - install: - - *composer_install - - echo "APP_ENV=codeception" > .env - - *eccube_setup - php: 7.3 - env: GROUP=admin01 APP_ENV=codeception DATABASE_URL=postgres://postgres:password@localhost/eccube_db DATABASE_SERVER_VERSION=9 MAILER_URL=smtp://localhost:1025 - script: ./codeception.sh -g ${GROUP} - - <<: *e2e_test - php: 7.3 - env: GROUP=admin02 APP_ENV=codeception DATABASE_URL=postgres://postgres:password@localhost/eccube_db DATABASE_SERVER_VERSION=9 MAILER_URL=smtp://localhost:1025 - - <<: *e2e_test - php: 7.3 - env: GROUP=admin03 APP_ENV=codeception DATABASE_URL=postgres://postgres:password@localhost/eccube_db DATABASE_SERVER_VERSION=9 MAILER_URL=smtp://localhost:1025 - - <<: *e2e_test - php: 7.3 - env: GROUP=front APP_ENV=codeception DATABASE_URL=postgres://postgres:password@localhost/eccube_db DATABASE_SERVER_VERSION=9 MAILER_URL=smtp://localhost:1025 - - <<: *e2e_test - php: 7.3 - env: APP_ENV=codeception DATABASE_URL=postgres://postgres:password@localhost/eccube_db DATABASE_SERVER_VERSION=9 MAILER_URL=smtp://localhost:1025 ECCUBE_PACKAGE_API_URL=http://localhost:8080 NO_FIXTURES=1 - script: - - *package_api_setup - - | - psql eccube_db -h 127.0.0.1 -U postgres -c "update dtb_base_info set authentication_key='test';" - ./codeception.sh EA10PluginCest:test_install_enable_disable_remove_store - - | - ./codeception.sh --reset - psql eccube_db -h 127.0.0.1 -U postgres -c "update dtb_base_info set authentication_key='test';" - ./codeception.sh EA10PluginCest:test_install_enable_disable_remove_local - - | - ./codeception.sh --reset - psql eccube_db -h 127.0.0.1 -U postgres -c "update dtb_base_info set authentication_key='test';" - ./codeception.sh EA10PluginCest:test_install_enable_disable_enable_disable_remove_store - - | - ./codeception.sh --reset - psql eccube_db -h 127.0.0.1 -U postgres -c "update dtb_base_info set authentication_key='test';" - ./codeception.sh EA10PluginCest:test_install_enable_disable_enable_disable_remove_local - - | - ./codeception.sh --reset - psql eccube_db -h 127.0.0.1 -U postgres -c "update dtb_base_info set authentication_key='test';" - ./codeception.sh EA10PluginCest:test_install_remove_local - - | - ./codeception.sh --reset - psql eccube_db -h 127.0.0.1 -U postgres -c "update dtb_base_info set authentication_key='test';" - ./codeception.sh EA10PluginCest:test_install_remove_store - - <<: *e2e_test - php: 7.3 - env: APP_ENV=codeception DATABASE_URL=postgres://postgres:password@localhost/eccube_db DATABASE_SERVER_VERSION=9 MAILER_URL=smtp://localhost:1025 ECCUBE_PACKAGE_API_URL=http://localhost:8080 NO_FIXTURES=1 - script: - - *package_api_setup - - | - psql eccube_db -h 127.0.0.1 -U postgres -c "update dtb_base_info set authentication_key='test';" - ./codeception.sh EA10PluginCest:test_install_update_remove_store - - | - ./codeception.sh --reset - psql eccube_db -h 127.0.0.1 -U postgres -c "update dtb_base_info set authentication_key='test';" - ./codeception.sh EA10PluginCest:test_install_update_remove_local - - | - ./codeception.sh --reset - psql eccube_db -h 127.0.0.1 -U postgres -c "update dtb_base_info set authentication_key='test';" - ./codeception.sh EA10PluginCest:test_install_enable_disable_update_enable_disable_remove_local - - | - ./codeception.sh --reset - psql eccube_db -h 127.0.0.1 -U postgres -c "update dtb_base_info set authentication_key='test';" - ./codeception.sh EA10PluginCest:test_install_enable_disable_update_enable_disable_remove_store - - | - ./codeception.sh --reset - psql eccube_db -h 127.0.0.1 -U postgres -c "update dtb_base_info set authentication_key='test';" - ./codeception.sh EA10PluginCest:test_install_enable_update_disable_remove_store - - | - ./codeception.sh --reset - psql eccube_db -h 127.0.0.1 -U postgres -c "update dtb_base_info set authentication_key='test';" - ./codeception.sh EA10PluginCest:test_install_enable_update_disable_remove_local - - <<: *e2e_test - php: 7.3 - env: APP_ENV=codeception DATABASE_URL=postgres://postgres:password@localhost/eccube_db DATABASE_SERVER_VERSION=9 MAILER_URL=smtp://localhost:1025 ECCUBE_PACKAGE_API_URL=http://localhost:8080 NO_FIXTURES=1 - script: - - *package_api_setup - - | - psql eccube_db -h 127.0.0.1 -U postgres -c "update dtb_base_info set authentication_key='test';" - ./codeception.sh EA10PluginCest:test_install_update_enable_disable_remove_local - - | - ./codeception.sh --reset - psql eccube_db -h 127.0.0.1 -U postgres -c "update dtb_base_info set authentication_key='test';" - ./codeception.sh EA10PluginCest:test_install_update_enable_disable_remove_store - - | - ./codeception.sh --reset - psql eccube_db -h 127.0.0.1 -U postgres -c "update dtb_base_info set authentication_key='test';" - ./codeception.sh EA10PluginCest:test_install_enable_enable - - | - ./codeception.sh --reset - psql eccube_db -h 127.0.0.1 -U postgres -c "update dtb_base_info set authentication_key='test';" - ./codeception.sh EA10PluginCest:test_install_disable_disable - - | - ./codeception.sh --reset - psql eccube_db -h 127.0.0.1 -U postgres -c "update dtb_base_info set authentication_key='test';" - ./codeception.sh EA10PluginCest:test_install_assets_local - - | - ./codeception.sh --reset - psql eccube_db -h 127.0.0.1 -U postgres -c "update dtb_base_info set authentication_key='test';" - ./codeception.sh EA10PluginCest:test_install_assets_store - - <<: *e2e_test - php: 7.3 - env: APP_ENV=codeception DATABASE_URL=postgres://postgres:password@localhost/eccube_db DATABASE_SERVER_VERSION=9 MAILER_URL=smtp://localhost:1025 ECCUBE_PACKAGE_API_URL=http://localhost:8080 NO_FIXTURES=1 - script: - - *package_api_setup - - | - psql eccube_db -h 127.0.0.1 -U postgres -c "update dtb_base_info set authentication_key='test';" - ./codeception.sh EA10PluginCest:test_extend_same_table_store - - | - ./codeception.sh --reset - psql eccube_db -h 127.0.0.1 -U postgres -c "update dtb_base_info set authentication_key='test';" - ./codeception.sh EA10PluginCest:test_extend_same_table_disabled_remove_store - - | - ./codeception.sh --reset - psql eccube_db -h 127.0.0.1 -U postgres -c "update dtb_base_info set authentication_key='test';" - ./codeception.sh EA10PluginCest:test_extend_same_table_local - - | - ./codeception.sh --reset - psql eccube_db -h 127.0.0.1 -U postgres -c "update dtb_base_info set authentication_key='test';" - ./codeception.sh EA10PluginCest:test_extend_same_table_disabled_remove_local - - | - ./codeception.sh --reset - psql eccube_db -h 127.0.0.1 -U postgres -c "update dtb_base_info set authentication_key='test';" - ./codeception.sh EA10PluginCest:test_extend_same_table_crossed_store - - | - ./codeception.sh --reset - psql eccube_db -h 127.0.0.1 -U postgres -c "update dtb_base_info set authentication_key='test';" - ./codeception.sh EA10PluginCest:test_extend_same_table_crossed_local - - <<: *e2e_test - php: 7.3 - env: APP_ENV=codeception DATABASE_URL=postgres://postgres:password@localhost/eccube_db DATABASE_SERVER_VERSION=9 MAILER_URL=smtp://localhost:1025 ECCUBE_PACKAGE_API_URL=http://localhost:8080 NO_FIXTURES=1 - script: - - *package_api_setup - - | - psql eccube_db -h 127.0.0.1 -U postgres -c "update dtb_base_info set authentication_key='test';" - ./codeception.sh EA10PluginCest:test_dependency_each_install_plugin - - | - ./codeception.sh --reset - psql eccube_db -h 127.0.0.1 -U postgres -c "update dtb_base_info set authentication_key='test';" - ./codeception.sh EA10PluginCest:test_dependency_plugin_install - - | - ./codeception.sh --reset - psql eccube_db -h 127.0.0.1 -U postgres -c "update dtb_base_info set authentication_key='test';" - ./codeception.sh EA10PluginCest:test_dependency_plugin_update - - | - ./codeception.sh --reset - psql eccube_db -h 127.0.0.1 -U postgres -c "update dtb_base_info set authentication_key='test';" - ./codeception.sh EA10PluginCest:test_install_error - - | - ./codeception.sh --reset - psql eccube_db -h 127.0.0.1 -U postgres -c "update dtb_base_info set authentication_key='test', php_path = '$(which php)';" - ./codeception.sh EA10PluginCest:install_enable_disable_enable_disable_remove_store - - | - ./codeception.sh --reset - psql eccube_db -h 127.0.0.1 -U postgres -c "update dtb_base_info set authentication_key='test', php_path = '$(which php)';" - ./codeception.sh EA10PluginCest:test_enhance_plugin_entity - - <<: *e2e_test - php: 7.3 - env: APP_ENV=codeception DATABASE_URL=mysql://root:@localhost/eccube_db DATABASE_SERVER_VERSION=5 MAILER_URL=smtp://localhost:1025 ECCUBE_PACKAGE_API_URL=http://localhost:8080 NO_FIXTURES=1 - script: - - *package_api_setup - - | - mysql -h 127.0.0.1 -u root eccube_db -e "update dtb_base_info set authentication_key='test';" - ./codeception.sh EA10PluginCest:test_install_enable_disable_remove_store - - | - ./codeception.sh --reset - mysql -h 127.0.0.1 -u root eccube_db -e "update dtb_base_info set authentication_key='test';" - ./codeception.sh EA10PluginCest:test_install_enable_disable_remove_local - - | - ./codeception.sh --reset - mysql -h 127.0.0.1 -u root eccube_db -e "update dtb_base_info set authentication_key='test';" - ./codeception.sh EA10PluginCest:test_install_enable_disable_enable_disable_remove_store - - | - ./codeception.sh --reset - mysql -h 127.0.0.1 -u root eccube_db -e "update dtb_base_info set authentication_key='test';" - ./codeception.sh EA10PluginCest:test_install_enable_disable_enable_disable_remove_local - - | - ./codeception.sh --reset - mysql -h 127.0.0.1 -u root eccube_db -e "update dtb_base_info set authentication_key='test';" - ./codeception.sh EA10PluginCest:test_install_remove_local - - | - ./codeception.sh --reset - mysql -h 127.0.0.1 -u root eccube_db -e "update dtb_base_info set authentication_key='test';" - ./codeception.sh EA10PluginCest:test_install_remove_store - - <<: *e2e_test - php: 7.3 - env: APP_ENV=codeception DATABASE_URL=mysql://root:@localhost/eccube_db DATABASE_SERVER_VERSION=5 MAILER_URL=smtp://localhost:1025 ECCUBE_PACKAGE_API_URL=http://localhost:8080 NO_FIXTURES=1 - script: - - *package_api_setup - - | - mysql -h 127.0.0.1 -u root eccube_db -e "update dtb_base_info set authentication_key='test';" - ./codeception.sh EA10PluginCest:test_install_update_remove_store - - | - ./codeception.sh --reset - mysql -h 127.0.0.1 -u root eccube_db -e "update dtb_base_info set authentication_key='test';" - ./codeception.sh EA10PluginCest:test_install_update_remove_local - - | - ./codeception.sh --reset - mysql -h 127.0.0.1 -u root eccube_db -e "update dtb_base_info set authentication_key='test';" - ./codeception.sh EA10PluginCest:test_install_enable_disable_update_enable_disable_remove_local - - | - ./codeception.sh --reset - mysql -h 127.0.0.1 -u root eccube_db -e "update dtb_base_info set authentication_key='test';" - ./codeception.sh EA10PluginCest:test_install_enable_disable_update_enable_disable_remove_store - - | - ./codeception.sh --reset - mysql -h 127.0.0.1 -u root eccube_db -e "update dtb_base_info set authentication_key='test';" - ./codeception.sh EA10PluginCest:test_install_enable_update_disable_remove_store - - | - ./codeception.sh --reset - mysql -h 127.0.0.1 -u root eccube_db -e "update dtb_base_info set authentication_key='test';" - ./codeception.sh EA10PluginCest:test_install_enable_update_disable_remove_local - - <<: *e2e_test - php: 7.3 - env: APP_ENV=codeception DATABASE_URL=mysql://root:@localhost/eccube_db DATABASE_SERVER_VERSION=5 MAILER_URL=smtp://localhost:1025 ECCUBE_PACKAGE_API_URL=http://localhost:8080 NO_FIXTURES=1 - script: - - *package_api_setup - - | - mysql -h 127.0.0.1 -u root eccube_db -e "update dtb_base_info set authentication_key='test';" - ./codeception.sh EA10PluginCest:test_install_update_enable_disable_remove_local - - | - ./codeception.sh --reset - mysql -h 127.0.0.1 -u root eccube_db -e "update dtb_base_info set authentication_key='test';" - ./codeception.sh EA10PluginCest:test_install_update_enable_disable_remove_store - - | - ./codeception.sh --reset - mysql -h 127.0.0.1 -u root eccube_db -e "update dtb_base_info set authentication_key='test';" - ./codeception.sh EA10PluginCest:test_install_enable_enable - - | - ./codeception.sh --reset - mysql -h 127.0.0.1 -u root eccube_db -e "update dtb_base_info set authentication_key='test';" - ./codeception.sh EA10PluginCest:test_install_disable_disable - - | - ./codeception.sh --reset - mysql -h 127.0.0.1 -u root eccube_db -e "update dtb_base_info set authentication_key='test';" - ./codeception.sh EA10PluginCest:test_install_assets_local - - | - ./codeception.sh --reset - mysql -h 127.0.0.1 -u root eccube_db -e "update dtb_base_info set authentication_key='test';" - ./codeception.sh EA10PluginCest:test_install_assets_store - - <<: *e2e_test - php: 7.3 - env: APP_ENV=codeception DATABASE_URL=mysql://root:@localhost/eccube_db DATABASE_SERVER_VERSION=5 MAILER_URL=smtp://localhost:1025 ECCUBE_PACKAGE_API_URL=http://localhost:8080 NO_FIXTURES=1 - script: - - *package_api_setup - - | - mysql -h 127.0.0.1 -u root eccube_db -e "update dtb_base_info set authentication_key='test';" - ./codeception.sh EA10PluginCest:test_extend_same_table_store - - | - ./codeception.sh --reset - mysql -h 127.0.0.1 -u root eccube_db -e "update dtb_base_info set authentication_key='test';" - ./codeception.sh EA10PluginCest:test_extend_same_table_disabled_remove_store - - | - ./codeception.sh --reset - mysql -h 127.0.0.1 -u root eccube_db -e "update dtb_base_info set authentication_key='test';" - ./codeception.sh EA10PluginCest:test_extend_same_table_local - - | - ./codeception.sh --reset - mysql -h 127.0.0.1 -u root eccube_db -e "update dtb_base_info set authentication_key='test';" - ./codeception.sh EA10PluginCest:test_extend_same_table_disabled_remove_local - - | - ./codeception.sh --reset - mysql -h 127.0.0.1 -u root eccube_db -e "update dtb_base_info set authentication_key='test';" - ./codeception.sh EA10PluginCest:test_extend_same_table_crossed_store - - | - ./codeception.sh --reset - mysql -h 127.0.0.1 -u root eccube_db -e "update dtb_base_info set authentication_key='test';" - ./codeception.sh EA10PluginCest:test_extend_same_table_crossed_local - - <<: *e2e_test - php: 7.3 - env: APP_ENV=codeception DATABASE_URL=mysql://root:@localhost/eccube_db DATABASE_SERVER_VERSION=5 MAILER_URL=smtp://localhost:1025 ECCUBE_PACKAGE_API_URL=http://localhost:8080 NO_FIXTURES=1 - script: - - *package_api_setup - - | - mysql -h 127.0.0.1 -u root eccube_db -e "update dtb_base_info set authentication_key='test';" - ./codeception.sh EA10PluginCest:test_dependency_each_install_plugin - - | - ./codeception.sh --reset - mysql -h 127.0.0.1 -u root eccube_db -e "update dtb_base_info set authentication_key='test';" - ./codeception.sh EA10PluginCest:test_dependency_plugin_install -# - | -# ./codeception.sh --reset -# mysql -h 127.0.0.1 -u root eccube_db -e "update dtb_base_info set authentication_key='test';" -# ./codeception.sh EA10PluginCest:test_dependency_plugin_update - - | - ./codeception.sh --reset - mysql -h 127.0.0.1 -u root eccube_db -e "update dtb_base_info set authentication_key='test', php_path = '$(which php)';" - ./codeception.sh EA10PluginCest:install_enable_disable_enable_disable_remove_store - - | - ./codeception.sh --reset - mysql -h 127.0.0.1 -u root eccube_db -e "update dtb_base_info set authentication_key='test', php_path = '$(which php)';" - ./codeception.sh EA10PluginCest:test_enhance_plugin_entity - - # インストーラのテスト - - <<: *e2e_test - # codeceptionのbootstrapでデータ投入を行っているので、本来は不要だけどコマンドラインからのインストールを実行させる - php: 7.3 - env: GROUP=installer APP_ENV=codeception DATABASE_URL=postgres://postgres:password@localhost/eccube_db DATABASE_SERVER_VERSION=9 MAILER_URL=smtp://localhost:1025 - script: - - echo "APP_ENV=install" >> .env - - ./codeception.sh -g ${GROUP} - - # - stage: Code Coverage - # if: type != pull_request - # env: DATABASE_URL=sqlite:///%kernel.project_dir%/var/eccube.db DATABASE_SERVER_VERSION=3 COVERAGE=1 - # before_install: - # - *php_setup - # - gem install mailcatcher - # install: - # - *composer_install - # - *eccube_setup - # script: - # - docker run -e DATABASE_URL=sqlite:////usr/src/myapp/var/eccube.db -v "$PWD":/usr/src/myapp:cached -w /usr/src/myapp --rm nanasess/phpdbg phpdbg -qrr -dmemory_limit=-1 ./bin/phpunit --exclude-group cache-clear --coverage-clover=coverage.clover - # after_success: - # - sed -i.bak -e 's|/usr/src/myapp/||g' coverage.clover - # - php vendor/bin/php-coveralls -v -x coverage.clover - # after_script: - # - wget https://scrutinizer-ci.com/ocular.phar - # - php ocular.phar code-coverage:upload --format=php-clover coverage.clover diff --git a/Dockerfile b/Dockerfile index 592d4ed005b..f13637b01aa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,6 +23,7 @@ RUN apt-get update \ ssl-cert \ unzip \ zlib1g-dev \ + libwebp-dev \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* \ && echo "en_US.UTF-8 UTF-8" >/etc/locale.gen \ @@ -30,7 +31,7 @@ RUN apt-get update \ ; RUN docker-php-ext-configure pgsql -with-pgsql=/usr/local/pgsql \ - && docker-php-ext-configure gd --with-freetype-dir=/usr/include/freetype2 --with-png-dir=/usr/include --with-jpeg-dir=/usr/include \ + && docker-php-ext-configure gd --with-freetype-dir=/usr/include/freetype2 --with-png-dir=/usr/include --with-jpeg-dir=/usr/include --with-webp-dir=/usr/include \ && docker-php-ext-install -j$(nproc) zip gd mysqli pdo_mysql opcache intl pgsql pdo_pgsql \ ; @@ -55,30 +56,43 @@ EXPOSE 443 RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini" # Override with custom configuration settings COPY dockerbuild/php.ini $PHP_INI_DIR/conf.d/ +COPY dockerbuild/docker-php-entrypoint /usr/local/bin/ -COPY . ${APACHE_DOCUMENT_ROOT} - -WORKDIR ${APACHE_DOCUMENT_ROOT} +RUN chown www-data:www-data /var/www \ + && mkdir -p ${APACHE_DOCUMENT_ROOT}/vendor \ + && mkdir -p ${APACHE_DOCUMENT_ROOT}/var \ + && chown www-data:www-data ${APACHE_DOCUMENT_ROOT}/vendor \ + && chmod g+s ${APACHE_DOCUMENT_ROOT}/vendor RUN curl -sS https://getcomposer.org/installer \ | php \ - && mv composer.phar /usr/bin/composer \ - && composer config -g repos.packagist composer https://packagist.jp \ - && chown www-data:www-data /var/www \ - && mkdir -p ${APACHE_DOCUMENT_ROOT}/var \ - && chown -R www-data:www-data ${APACHE_DOCUMENT_ROOT} \ - && find ${APACHE_DOCUMENT_ROOT} -type d -print0 \ - | xargs -0 chmod g+s \ - ; + && mv composer.phar /usr/bin/composer +# 全体コピー前にcomposer installを先行完了させる(docker cache利用によるリビルド速度向上) USER www-data - +RUN composer config -g repos.packagist composer https://packagist.jp \ + && composer global require hirak/prestissimo +COPY composer.json ${APACHE_DOCUMENT_ROOT}/composer.json +COPY composer.lock ${APACHE_DOCUMENT_ROOT}/composer.lock RUN composer install \ --no-scripts \ --no-autoloader \ -d ${APACHE_DOCUMENT_ROOT} \ ; +################################################################## +# ファイル変更時、以後のステップにはキャッシュが効かなくなる +USER root +COPY . ${APACHE_DOCUMENT_ROOT} +WORKDIR ${APACHE_DOCUMENT_ROOT} + +RUN find ${APACHE_DOCUMENT_ROOT} \( -path ${APACHE_DOCUMENT_ROOT}/vendor -prune \) -or -print0 \ + | xargs -0 chown www-data:www-data \ + && find ${APACHE_DOCUMENT_ROOT} \( -path ${APACHE_DOCUMENT_ROOT}/vendor -prune \) -or \( -type d -print0 \) \ + | xargs -0 chmod g+s \ + ; + +USER www-data RUN composer dumpautoload -o --apcu RUN if [ ! -f ${APACHE_DOCUMENT_ROOT}/.env ]; then \ diff --git a/README.md b/README.md index 8ad850cc9a9..caecc0e8cfa 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,10 @@ # EC-CUBE 4.1 -[![Build Status](https://travis-ci.com/EC-CUBE/ec-cube.svg?branch=4.1)](https://travis-ci.com/EC-CUBE/ec-cube) -[![AppVeyor](https://img.shields.io/appveyor/ci/ECCUBE/ec-cube)](https://ci.appveyor.com/project/ECCUBE/ec-cube) -[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/EC-CUBE/ec-cube/badges/quality-score.png?b=4.1)](https://scrutinizer-ci.com/g/EC-CUBE/ec-cube/?branch=4.1) -[![Coverage Status](https://coveralls.io/repos/github/EC-CUBE/ec-cube/badge.svg?branch=4.1)](https://coveralls.io/github/EC-CUBE/ec-cube?branch=4.1) +[![Unit test for EC-CUBE](https://github.com/EC-CUBE/ec-cube/actions/workflows/unit-test.yml/badge.svg?branch=4.1)](https://github.com/EC-CUBE/ec-cube/actions/workflows/unit-test.yml) +[![E2E test for EC-CUBE](https://github.com/EC-CUBE/ec-cube/actions/workflows/e2e-test.yml/badge.svg?branch=4.1)](https://github.com/EC-CUBE/ec-cube/actions/workflows/e2e-test.yml) +[![Plugin test for EC-CUBE](https://github.com/EC-CUBE/ec-cube/actions/workflows/plugin-test.yml/badge.svg?branch=4.1)](https://github.com/EC-CUBE/ec-cube/actions/workflows/plugin-test.yml) +[![PHPStan](https://github.com/EC-CUBE/ec-cube/actions/workflows/phpstan.yml/badge.svg?branch=4.1)](https://github.com/EC-CUBE/ec-cube/actions/workflows/phpstan.yml) +[![codecov](https://codecov.io/gh/EC-CUBE/ec-cube/branch/4.1/graph/badge.svg?token=BhnPjjvfwd)](https://codecov.io/gh/EC-CUBE/ec-cube) [![Slack](https://img.shields.io/badge/slack-join%5fchat-brightgreen.svg?style=flat)](https://join.slack.com/t/ec-cube/shared_invite/enQtNDA1MDYzNDQxMTIzLTY5MTRhOGQ2MmZhMjQxYTAwMmVlMDc5MDU2NjJlZmFiM2E3M2Q0M2Y3OTRlMGY4NTQzN2JiZDBkNmQwNTUzYzc) @@ -11,9 +12,9 @@ **EC-CUBE 4.1は現在β版です。4.0からの更新内容は[リリースノート](https://github.com/EC-CUBE/ec-cube/releases/tag/4.1-beta)をご確認ください。** -+ 本ドキュメントはEC-CUBEの開発者を主要な対象者としております。 -+ パッケージ版は正式リリース後に[EC-CUBEオフィシャルサイト](https://www.ec-cube.net)で配布します。 -+ カスタマイズやEC-CUBEの利用、仕様に関しては[開発コミュニティ](https://xoops.ec-cube.net)をご利用ください。 ++ 本ドキュメントはEC-CUBEの開発者を主要な対象者としております。 ++ パッケージ版は正式リリース後に[EC-CUBEオフィシャルサイト](https://www.ec-cube.net)で配布します。 ++ カスタマイズやEC-CUBEの利用、仕様に関しては[開発コミュニティ](https://xoops.ec-cube.net)をご利用ください。 + 本体開発にあたって不明点などあれば[Issue](https://github.com/EC-CUBE/ec-cube/wiki/Issues%E3%81%AE%E5%88%A9%E7%94%A8%E6%96%B9%E6%B3%95)をご利用下さい。 + EC-CUBE 3系の保守については、 [EC-CUBE/ec-cube3](https://github.com/EC-CUBE/ec-cube3/)にて開発を行っております。 + EC-CUBE 2系の保守については、 [EC-CUBE/ec-cube2](https://github.com/EC-CUBE/ec-cube2/)にて開発を行っております。 @@ -39,20 +40,20 @@ npm run build # Sass のビルド ### 動作確認環境 -* Apache/2.4.x (mod_rewrite / mod_ssl 必須) -* PHP7.1.20 -* PostgreSQL 9.2.1 -* ブラウザー：Google Chrome +* Apache 2.4.x (mod_rewrite / mod_ssl 必須) +* PHP 7.3.x +* PostgreSQL 10.x / MySQL 5.7.x +* ブラウザー：Google Chrome 詳しくは開発ドキュメントの [システム要件](https://doc4.ec-cube.net/quickstart_requirement) をご確認ください。 ## ドキュメント -### [EC-CUBE 4.0 開発ドキュメント@doc4.ec-cube.net](https://doc4.ec-cube.net/) +### [EC-CUBE 4.x 開発ドキュメント@doc4.ec-cube.net](https://doc4.ec-cube.net/) -EC-CUBE 4.0 の仕様や手順、開発Tipsに関するドキュメントを掲載しています。 -修正や追記、新規ドキュメントの作成をいただく場合、以下のレポジトリからPullRequestをお送りください。 +EC-CUBE 4.x 系の仕様や手順、開発Tipsに関するドキュメントを掲載しています。 +修正や追記、新規ドキュメントの作成をいただく場合、以下のレポジトリからPullRequestをお送りください。 [https://github.com/EC-CUBE/doc4.ec-cube.net](https://github.com/EC-CUBE/doc4.ec-cube.net) ## 開発への参加 @@ -60,8 +61,8 @@ EC-CUBE 4.0 の仕様や手順、開発Tipsに関するドキュメントを掲 EC-CUBE 4.1の不具合の修正、機能のブラッシュアップを目的として、継続的に開発を行っております。 コードのリファクタリング、不具合修正以外のPullRequestを送る際は、Pull Requestのコメントなどに意図を明確に記載してください。 -Pull Requestの送信前に、Issueにて提議いただく事も可能です。 -Issuesの利用方法については、[こちら](https://github.com/EC-CUBE/ec-cube/wiki/Issues%E3%81%AE%E5%88%A9%E7%94%A8%E6%96%B9%E6%B3%95)をご確認ください。 +Pull Requestの送信前に、Issueにて提議いただく事も可能です。 +Issuesの利用方法については、[こちら](https://github.com/EC-CUBE/ec-cube/wiki/Issues%E3%81%AE%E5%88%A9%E7%94%A8%E6%96%B9%E6%B3%95)をご確認ください。 [Slack](https://join.slack.com/t/ec-cube/shared_invite/enQtNDA1MDYzNDQxMTIzLTY5MTRhOGQ2MmZhMjQxYTAwMmVlMDc5MDU2NjJlZmFiM2E3M2Q0M2Y3OTRlMGY4NTQzN2JiZDBkNmQwNTUzYzc)でも本体の開発に関する意見交換などを行っております。 @@ -69,6 +70,6 @@ Issuesの利用方法については、[こちら](https://github.com/EC-CUBE/ec ### コピーライトポリシーへの同意 -コードの提供・追加、修正・変更その他「EC-CUBE」への開発の御協力（Issue投稿、PullRequest投稿など、GitHub上での活動）を行っていただく場合には、 +コードの提供・追加、修正・変更その他「EC-CUBE」への開発の御協力（Issue投稿、Pull Request投稿など、GitHub上での活動）を行っていただく場合には、 [EC-CUBEのコピーライトポリシー](https://github.com/EC-CUBE/ec-cube/wiki/EC-CUBE%E3%81%AE%E3%82%B3%E3%83%94%E3%83%BC%E3%83%A9%E3%82%A4%E3%83%88%E3%83%9D%E3%83%AA%E3%82%B7%E3%83%BC)をご理解いただき、ご了承いただく必要がございます。 -Issueの投稿やPullRequestを送信する際は、EC-CUBEのコピーライトポリシーに同意したものとみなします。 +Issueの投稿やPull Requestを送信する際は、EC-CUBEのコピーライトポリシーに同意したものとみなします。 diff --git a/app/DoctrineMigrations/Version20201127000000.php b/app/DoctrineMigrations/Version20201127000000.php new file mode 100644 index 00000000000..fd5f8ebf01c --- /dev/null +++ b/app/DoctrineMigrations/Version20201127000000.php @@ -0,0 +1,74 @@ +connection->fetchColumn("SELECT COUNT(*) FROM dtb_page WHERE url = 'entry_confirm'"); + if ($count > 0) { + return; + } + $pageId = $this->connection->fetchColumn('SELECT MAX(id) FROM dtb_page'); + $sortNo = $this->connection->fetchColumn('SELECT MAX(sort_no) FROM dtb_page_layout'); + + $pageId++; + $this->addSql("INSERT INTO dtb_page ( + id, master_page_id, page_name, url, file_name, edit_type, create_date, update_date, meta_robots, discriminator_type + ) VALUES( + $pageId, 18, '会員登録(確認ページ)', 'entry_confirm', 'Entry/confirm', 3, '2020-01-12 01:15:03', '2020-01-12 01:15:03', 'noindex', 'page' + )"); + + $sortNo++; + $this->addSql("INSERT INTO dtb_page_layout (page_id, layout_id, sort_no, discriminator_type) VALUES ($pageId, 2, $sortNo, 'pagelayout')"); + + $pageId++; + $this->addSql("INSERT INTO dtb_page ( + id, master_page_id, page_name, url, file_name, edit_type, create_date, update_date, meta_robots, discriminator_type + ) VALUES( + $pageId, 12, 'MYページ/退会手続き(確認ページ)', 'mypage_withdraw_confirm', 'Mypage/withdraw_confirm', 3, '2020-01-12 01:15:03', '2020-01-12 01:15:03', 'noindex', 'page' + )"); + + $sortNo++; + $this->addSql("INSERT INTO dtb_page_layout (page_id, layout_id, sort_no, discriminator_type) VALUES ($pageId, 2, $sortNo, 'pagelayout')"); + + $pageId++; + $this->addSql("INSERT INTO dtb_page ( + id, master_page_id, page_name, url, file_name, edit_type, create_date, update_date, meta_robots, discriminator_type + ) VALUES( + $pageId, 16, 'お問い合わせ(確認ページ)', 'contact_confirm', 'Contact/confirm', 3, '2020-01-12 01:15:03', '2020-01-12 01:15:03', 'noindex', 'page' + )"); + + $sortNo++; + $this->addSql("INSERT INTO dtb_page_layout (page_id, layout_id, sort_no, discriminator_type) VALUES ($pageId, 2, $sortNo, 'pagelayout')"); + + if ($this->platform->getName() === 'postgresql') { + $this->addSql("SELECT setval('dtb_page_id_seq', $pageId)"); + } + } + + public function down(Schema $schema): void + { + // this down() migration is auto-generated, please modify it to your needs + } +} diff --git a/app/DoctrineMigrations/Version20201218044542.php b/app/DoctrineMigrations/Version20201218044542.php new file mode 100644 index 00000000000..3c9fb1dc66d --- /dev/null +++ b/app/DoctrineMigrations/Version20201218044542.php @@ -0,0 +1,45 @@ +connection->fetchColumn("SELECT COUNT(*) FROM dtb_csv WHERE csv_type_id = 2 AND field_name = 'point'"); + + if ($pointExists == 0) { + $sortNo = $this->connection->fetchColumn('SELECT MAX(sort_no) + 1 FROM dtb_csv WHERE csv_type_id = 2'); + $this->addSql("INSERT INTO dtb_csv ( + csv_type_id, creator_id, entity_name, field_name, disp_name, sort_no, enabled, create_date, update_date, discriminator_type + ) VALUES ( + 2, null, ?, 'point', 'ポイント', $sortNo, false, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'csv' + )", + ['Eccube\\\\Entity\\\\Customer']); + } + } + + public function down(Schema $schema): void + { + // this down() migration is auto-generated, please modify it to your needs + } +} diff --git a/app/DoctrineMigrations/Version20210319122142.php b/app/DoctrineMigrations/Version20210319122142.php new file mode 100644 index 00000000000..90a320c2d22 --- /dev/null +++ b/app/DoctrineMigrations/Version20210319122142.php @@ -0,0 +1,59 @@ + $lang === 'en' ? 'Failure' : '失敗', + LoginHistoryStatus::SUCCESS => $lang === 'en' ? 'Success' : '成功', + ]; + + $sortNo = $this->connection->fetchColumn('SELECT MAX(sort_no) + 1 FROM mtb_login_history_status'); + if (is_null($sortNo)) { + $sortNo = 0; + } + + foreach ($statuses as $id => $name) { + $statusExists = $this->connection->fetchColumn( + 'SELECT COUNT(*) FROM mtb_login_history_status WHERE id = :id', + [':id' => $id] + ); + + if ($statusExists == 0) { + $this->addSql( + "INSERT INTO mtb_login_history_status (id, name, sort_no, discriminator_type) VALUES (?, ?, ?, 'loginhistorystatus')", + [$id, $name, $sortNo++] + ); + } + } + } + + public function down(Schema $schema): void + { + // this down() migration is auto-generated, please modify it to your needs + } +} diff --git a/app/Plugin/HogePlugin/composer.json b/app/Plugin/HogePlugin/composer.json index 246630ca7fa..59cbe8b7c81 100644 --- a/app/Plugin/HogePlugin/composer.json +++ b/app/Plugin/HogePlugin/composer.json @@ -1,9 +1,9 @@ { - "name": "ec-cube/Hoge", + "name": "ec-cube/HogePlugin", "version": "1.0.0", "description": "プラグインサンプル", "type": "eccube-plugin", "extra": { - "code": "Hoge" + "code": "HogePlugin" } -} \ No newline at end of file +} diff --git a/app/config/eccube/packages/eccube.yaml b/app/config/eccube/packages/eccube.yaml index fe2022b07d8..426d3bc8a9d 100644 --- a/app/config/eccube/packages/eccube.yaml +++ b/app/config/eccube/packages/eccube.yaml @@ -3,6 +3,7 @@ parameters: env(ECCUBE_ADMIN_ROUTE): 'admin' env(ECCUBE_USER_DATA_ROUTE): 'user_data' env(ECCUBE_ADMIN_ALLOW_HOSTS): '[]' + env(ECCUBE_ADMIN_DENY_HOSTS): '[]' env(ECCUBE_FORCE_SSL): false env(ECCUBE_TEMPLATE_CODE): 'default' env(ECCUBE_AUTH_MAGIC): '' @@ -20,6 +21,7 @@ parameters: eccube_admin_route: '%env(ECCUBE_ADMIN_ROUTE)%' eccube_user_data_route: '%env(ECCUBE_USER_DATA_ROUTE)%' eccube_admin_allow_hosts: '%env(json:ECCUBE_ADMIN_ALLOW_HOSTS)%' + eccube_admin_deny_hosts: '%env(json:ECCUBE_ADMIN_DENY_HOSTS)%' eccube_force_ssl: '%env(bool:ECCUBE_FORCE_SSL)%' eccube.theme: '%env(ECCUBE_TEMPLATE_CODE)%' eccube_theme_code: '%eccube.theme%' @@ -42,6 +44,7 @@ parameters: eccube_temp_image_dir: '%kernel.project_dir%/html/upload/temp_image' eccube_csv_size: 5 # post_max_size, upload_max_filesize に任せればよい？ eccube_csv_temp_realdir: '%kernel.cache_dir%/%kernel.environment%/eccube' # upload_tmp_dir に任せればよい？ + eccube_csv_split_lines: 100 eccube_default_password: '**********' eccube_deliv_addr_max: 20 eccube_deliv_date_end_max: 21 @@ -73,6 +76,8 @@ parameters: eccube_csv_export_separator: , # 出力エンコーディング eccube_csv_export_encoding: SJIS-win + # 入力エンコーディング + eccube_csv_import_encoding: ['UTF-8', 'SJIS-win', 'SJIS', 'EUC-JP', 'ASCII', 'JIS'] # 日付のフォーマット eccube_csv_export_date_format: 'Y-m-d H:i:s' # 複数データの区切り文字 diff --git a/app/config/eccube/packages/eccube_nav.yaml b/app/config/eccube/packages/eccube_nav.yaml index 5abb0b706f2..14da3ac94b1 100644 --- a/app/config/eccube/packages/eccube_nav.yaml +++ b/app/config/eccube/packages/eccube_nav.yaml @@ -112,6 +112,9 @@ parameters: shop_csv: name: admin.setting.shop.csv_setting url: admin_setting_shop_csv + shop_order_status: + name: admin.setting.shop.order_status_setting + url: admin_setting_shop_order_status system: name: admin.setting.system children: @@ -124,6 +127,9 @@ parameters: security: name: admin.setting.system.security_management url: admin_setting_system_security + login_history: + name: admin.setting.system.login_history + url: admin_setting_system_login_history log: name: admin.setting.system.log_display url: admin_setting_system_log diff --git a/app/template/smartphone/.gitkeep b/app/template/smartphone/.gitkeep new file mode 100644 index 00000000000..e69de29bb2d diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index aba72cf58d7..00000000000 --- a/appveyor.yml +++ /dev/null @@ -1,72 +0,0 @@ -# appveyor file -# http://www.appveyor.com/docs/appveyor-yml - -# Set build version format here instead of in the admin panel. -version: 4.0.x-{build} - -clone_folder: c:\projects\ec-cube - -cache: - - '%LOCALAPPDATA%\Composer\files' - - vendor - - bin\.phpunit - -# Fix line endings in Windows. (runs before repo cloning) -init: - - git config --global core.autocrlf input - -environment: - global: - DATABASE_URL: "mysql://root:Password12!@localhost/myapp_test" - DATABASE_SERVER_VERSION: "5" - BASE_DIR: "C:/projects/ec-cube" - - matrix: - - db: mysql - provider: mysql - -services: - - mysql - -# Install scripts. (runs after repo cloning) -install: - # see https://github.com/phpmd/phpmd/blob/master/appveyor.yml#L10-L13 - - cinst -y OpenSSL.Light --version 1.1.1 - - SET PATH=C:\Program Files\OpenSSL;%PATH% - - sc config wuauserv start= auto - - net start wuauserv - # Set MySQL. - - cp tests/my.cnf c:\ - - SET PATH=C:\Program Files\MySql\MySQL Server 5.7\bin\;%PATH% - #- cinst mysql - #- SET PATH=C:\tools\mysql\current\bin\;%PATH% - # Set PHP. - - cinst php --version 7.2.10 --allow-empty-checksums - - SET PATH=C:\tools\php72\;%PATH% - - copy C:\tools\php72\php.ini-production C:\tools\php72\php.ini - - echo date.timezone="Asia/Tokyo" >> C:\tools\php72\php.ini - - echo extension_dir=ext >> C:\tools\php72\php.ini - - echo extension=php_gd2.dll >> C:\tools\php72\php.ini - - echo extension=php_mbstring.dll >> C:\tools\php72\php.ini - - echo extension=php_pgsql.dll >> C:\tools\php72\php.ini - - echo extension=php_pdo_mysql.dll >> C:\tools\php72\php.ini - - echo extension=php_pdo_pgsql.dll >> C:\tools\php72\php.ini - - echo extension=php_curl.dll >> C:\tools\php72\php.ini - - echo extension=php_fileinfo.dll >> C:\tools\php72\php.ini - - echo extension=php_intl.dll >> C:\tools\php72\php.ini - - echo extension=php_openssl.dll >> C:\tools\php72\php.ini - - echo memory_limit = 512M >> C:\tools\php72\php.ini - - echo APP_ENV=codeception >> .env - - php -r "readfile('http://getcomposer.org/installer');" | php - - php composer.phar install --dev --no-interaction -o - -# Don't actually build. -build: off - -before_test: - - php bin\console doctrine:database:create - - php bin\console doctrine:schema:create - - php bin\console eccube:fixtures:load - -test_script: - - php bin\phpunit --exclude-group cache-clear diff --git a/codeception.sh b/codeception.sh deleted file mode 100755 index 6deed80848c..00000000000 --- a/codeception.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash - -if [[ $1 == '--reset' ]]; then - rm -rf app/Plugin/* html - git checkout app/Plugin html - find app/proxy/entity -name '*.php' -delete - if [[ -f ".maintenance" ]]; then - rm .maintenance - fi - rm -rf var/cache - git checkout composer.json composer.lock - composer install --dev --no-interaction -o --apcu-autoloader - bin/console doctrine:schema:drop --force --full-database --env=dev - bin/console doctrine:schema:create --env=dev - bin/console eccube:fixtures:load --env=dev - exit -fi - -./chromedriver --url-base=/wd/hub & -CDPID="$!" -trap "kill ${CDPID}" exit - -mailcatcher -php -S localhost:8000 & - -vendor/bin/codecept -vvv run acceptance --env chrome,travis "$@" diff --git a/codeception/_support/AcceptanceTester.php b/codeception/_support/AcceptanceTester.php index 973ce6baa24..4c37722f331 100644 --- a/codeception/_support/AcceptanceTester.php +++ b/codeception/_support/AcceptanceTester.php @@ -67,7 +67,7 @@ public function logoutAsAdmin() $isLogin = $I->grabTextFrom('header.c-headerBar div.c-headerBar__container a.c-headerBar__userMenu span'); if ($isLogin == '管理者 様') { $I->click('header.c-headerBar div.c-headerBar__container a.c-headerBar__userMenu'); - $I->click('#page_admin_homepage div.popover .popover-body a:last-child'); + $I->click('body div.popover .popover-body a:last-child'); $config = Fixtures::get('config'); $I->amOnPage('/'.$config['eccube_admin_route'].'/logout'); $I->see('ログイン', '#form1 > button'); diff --git a/codeception/_support/Page/Admin/LoginHistoryPage.php b/codeception/_support/Page/Admin/LoginHistoryPage.php new file mode 100644 index 00000000000..efa69da86fd --- /dev/null +++ b/codeception/_support/Page/Admin/LoginHistoryPage.php @@ -0,0 +1,63 @@ + 'admin_search_login_history_multi']; + public static $検索ボタン = '#search_form .c-outsideBlock__contents button'; + public static $詳細検索ボタン = '//*[@id="search_form"]/div[1]/div[1]/div/div/div[2]/a/span'; + public static $検索結果_メッセージ = '//*[@id="search_form"]/div[2]/span'; + + public function __construct(\AcceptanceTester $I) + { + parent::__construct($I); + } + + public static function go(\AcceptanceTester $I) + { + $page = new self($I); + + return $page->goPage(self::$URL, 'ログイン履歴システム設定'); + } + + /** + * 指定したログインID/IPアドレスで検索する。 + * + * @param string $multi ログインID/IPアドレス + * + * @return $this + */ + public function 検索($multi = '') + { + $this->tester->fillField(self::$検索条件, $multi); + $this->tester->click(self::$検索ボタン); + $this->tester->see('ログイン履歴システム設定', '.c-pageTitle'); + + return $this; + } + + public function 詳細検索_ステータス($value) + { + $this->tester->click(self::$詳細検索ボタン); + $this->tester->wait(1); + $this->tester->checkOption(['id' => 'admin_search_login_history_Status_'.$value]); + $this->tester->click(self::$検索ボタン); + $this->tester->see('ログイン履歴システム設定', '.c-pageTitle'); + + return $this; + } +} diff --git a/codeception/_support/Page/Admin/OrderStatusSettingsPage.php b/codeception/_support/Page/Admin/OrderStatusSettingsPage.php new file mode 100644 index 00000000000..87102a3c203 --- /dev/null +++ b/codeception/_support/Page/Admin/OrderStatusSettingsPage.php @@ -0,0 +1,70 @@ + div.c-container > div.c-contentsArea > div.alert.alert-success.alert-dismissible.fade.show.m-3 > span'; + + /** + * CsvSettingsPage constructor. + */ + public function __construct(\AcceptanceTester $I) + { + parent::__construct($I); + } + + public static function go($I) + { + $page = new self($I); + + return $page->goPage('/setting/shop/order_status', '受注対応状況設定店舗設定'); + } + + public static function at($I) + { + $page = new self($I); + $page->tester->see('受注対応状況設定店舗設定', '.c-pageTitle'); + + return $page; + } + + public function 入力_名称_管理($value) + { + $this->tester->fillField(['id' => 'form_OrderStatuses_0_name'], $value); + + return $this; + } + + public function 入力_名称_マイページ($value) + { + $this->tester->fillField(['id' => 'form_OrderStatuses_0_customer_order_status_name'], $value); + + return $this; + } + + public function 入力_色($value) + { + $this->tester->fillField(['id' => 'form_OrderStatuses_0_color'], $value); + + return $this; + } + + public function 登録() + { + $this->tester->click('#ex-conversion-action > div > button'); + + return $this; + } +} diff --git a/codeception/_support/Page/Admin/ProductCsvUploadPage.php b/codeception/_support/Page/Admin/ProductCsvUploadPage.php index 95d6960a4c2..83fe81e0675 100644 --- a/codeception/_support/Page/Admin/ProductCsvUploadPage.php +++ b/codeception/_support/Page/Admin/ProductCsvUploadPage.php @@ -15,7 +15,7 @@ class ProductCsvUploadPage extends AbstractAdminPageStyleGuide { - public static $完了メッセージ = 'div.c-container > div.c-contentsArea > div.alert-success'; + public static $完了メッセージ = '#importCsvModal > div > div > div.modal-body.text-left > p'; /** * ProductCsvUploadPage constructor. @@ -32,6 +32,13 @@ public static function go($I) return $page->goPage('/product/product_csv_upload', '商品CSV登録商品管理'); } + public static function at($I) + { + $page = new self($I); + + return $page->atPage('商品CSV登録商品管理'); + } + public function 入力_CSVファイル($fileName) { $this->tester->attachFile(['id' => 'admin_csv_import_import_file'], $fileName); @@ -46,6 +53,44 @@ public function CSVアップロード() return $this; } + public function アップロードボタン有効化() + { + // $this->tester->attachFileでイベントが効かずボタンが有効化されないので、テストコードで有効化する. + $this->tester->waitForJS('return $("#upload-button").prop("disabled", false);', 1); + + return $this; + } + + public function モーダルを表示() + { + $this->tester->click(['id' => 'upload-button']); + + return $this; + } + + public function CSVアップロード実行() + { + $this->tester->wait(1); + $this->tester->click(['id' => 'importCsv']); + + return $this; + } + + public function CSVアップロード確認() + { + $this->tester->wait(1); + $this->tester->see('CSVファイルをアップロードしました', ProductCsvUploadPage::$完了メッセージ); + + return $this; + } + + public function モーダルを閉じる() + { + $this->tester->click(['id' => 'importCsvDone']); + + return $this; + } + public function 雛形ダウンロード() { $this->tester->click('#download-button'); diff --git a/codeception/acceptance/EA01TopCest.php b/codeception/acceptance/EA01TopCest.php index b3b9f3ea998..5114de5b9e5 100644 --- a/codeception/acceptance/EA01TopCest.php +++ b/codeception/acceptance/EA01TopCest.php @@ -82,10 +82,10 @@ public function top_001(AcceptanceTester $I) // お知らせの記事をクリックすると設定されたURLに遷移することを確認 $I->switchToIFrame('information'); $selector = '.news_area .link_list .tableish a:nth-child(1)'; - $url = $I->grabAttributeFrom($selector, 'href'); + $url = $I->executeJS('return location.href'); $I->click(['css' => $selector]); $I->switchToNewWindow(); - $I->assertEquals($url, $I->executeJS('return location.href'), $url.' が一致しません'); + $I->assertNotEquals($url, $I->executeJS('return location.href'), $url.' から遷移していません。'); $I->switchToWindow(); // ショップ情報の在庫切れ商品をクリックすると商品管理ページに遷移することを確認 diff --git a/codeception/acceptance/EA03ProductCest.php b/codeception/acceptance/EA03ProductCest.php index c5d90f4576d..46f4fdb1011 100644 --- a/codeception/acceptance/EA03ProductCest.php +++ b/codeception/acceptance/EA03ProductCest.php @@ -662,8 +662,14 @@ public function product_商品CSV登録(AcceptanceTester $I) ProductCsvUploadPage::go($I) ->入力_CSVファイル('product.csv') - ->CSVアップロード(); - $I->see('CSVファイルをアップロードしました', ProductCsvUploadPage::$完了メッセージ); + ->アップロードボタン有効化() + ->モーダルを表示() + ->CSVアップロード実行() + ->CSVアップロード確認() + ->モーダルを閉じる() + ; + + ProductCsvUploadPage::at($I); ProductManagePage::go($I)->検索('アップロード商品'); $I->see('検索結果：3件が該当しました', ProductManagePage::$検索結果_メッセージ); diff --git a/codeception/acceptance/EA07BasicinfoCest.php b/codeception/acceptance/EA07BasicinfoCest.php index 1df60c2d0ee..13029500861 100644 --- a/codeception/acceptance/EA07BasicinfoCest.php +++ b/codeception/acceptance/EA07BasicinfoCest.php @@ -16,6 +16,7 @@ use Page\Admin\DeliveryEditPage; use Page\Admin\DeliveryManagePage; use Page\Admin\MailSettingsPage; +use Page\Admin\OrderStatusSettingsPage; use Page\Admin\PaymentEditPage; use Page\Admin\PaymentManagePage; use Page\Admin\ShopSettingPage; @@ -272,6 +273,20 @@ public function basicinfo_CSV出力項目(AcceptanceTester $I) $I->see('保存しました', CsvSettingsPage::$登録完了メッセージ); } + public function basicinfo_受注対応状況設定(AcceptanceTester $I) + { + $I->wantTo('EA0711-UC01-T01 受注対応状況設定'); + + // 表示 + OrderStatusSettingsPage::go($I) + ->入力_名称_管理('新規受付') + ->入力_名称_マイページ('注文受付') + ->入力_色('#19406C') + ->登録(); + + $I->see('保存しました', OrderStatusSettingsPage::$登録完了メッセージ); + } + /** * EA10PluginCestではテストが失敗するため、ここでテストを行う */ diff --git a/codeception/acceptance/EA08SysteminfoCest.php b/codeception/acceptance/EA08SysteminfoCest.php index dca991be2cb..5a25379f221 100644 --- a/codeception/acceptance/EA08SysteminfoCest.php +++ b/codeception/acceptance/EA08SysteminfoCest.php @@ -13,6 +13,7 @@ use Codeception\Util\Fixtures; use Page\Admin\AuthorityManagePage; +use Page\Admin\LoginHistoryPage; /** * @group admin @@ -308,6 +309,24 @@ public function systeminfo_セキュリティ管理SSL(AcceptanceTester $I) $I->click('#page_admin_setting_system_security form div.c-contentsArea__cols > div.c-conversionArea > div > div > div:nth-child(2) > div > div > button'); } + /** + * GitHub Actions は IPv6で実行されており、アクセス拒否のテストはできない + */ + public function systeminfo_セキュリティ管理IP制限_拒否リスト(AcceptanceTester $I) + { + $I->wantTo('EA0804-UC01-T05 セキュリティ管理 - IP制限（拒否リスト）'); + + // 表示 + $config = Fixtures::get('config'); + $I->amOnPage('/'.$config['eccube_admin_route'].'/setting/system/security'); + $I->see('セキュリティ管理システム設定', '#page_admin_setting_system_security .c-pageTitle__titles'); + + $I->fillField(['id' => 'admin_security_admin_deny_hosts'], '1.1.1.1'); + $I->click('#page_admin_setting_system_security form div.c-contentsArea__cols > div.c-conversionArea > div > div > div:nth-child(2) > div > div > button'); + + $I->see('保存しました', AuthorityManagePage::$完了メッセージ); + } + public function systeminfo_権限管理追加(AcceptanceTester $I) { $I->wantTo('EA0805-UC01-T01 権限管理 - 追加'); @@ -377,12 +396,55 @@ public function systeminfo_マスターデータ管理(AcceptanceTester $I) $I->see('無回答', '#customer_form #admin_customer_sex'); } + public function systeminfo_ログイン履歴検索(AcceptanceTester $I) + { + $I->wantTo('EA0808-UC01-T01 ログイン履歴 - 検索'); + + LoginHistoryPage::go($I)->検索('admin'); + + // １項目目をチェック + $I->see('admin', '//*[@id="search_form"]/div[4]/div/div/div[2]/div/table/tbody/tr[1]/td[2]'); + $I->see('成功', '//*[@id="search_form"]/div[4]/div/div/div[2]/div/table/tbody/tr[1]/td[5]/span'); + + LoginHistoryPage::go($I)->検索('admin-failure'); + + $I->see('検索結果：0件が該当しました', LoginHistoryPage::$検索結果_メッセージ); + + $I->logoutAsAdmin(); + + // ログインに失敗する + $I->submitForm('#form1', [ + 'login_id' => 'admin-failure', + 'password' => 'password', + ]); + + $I->loginAsAdmin(); + + LoginHistoryPage::go($I)->検索('admin-failure'); + + // １項目目をチェック + $I->see('admin-failure', '//*[@id="search_form"]/div[4]/div/div/div[2]/div/table/tbody/tr[1]/td[2]'); + $I->see('失敗', '//*[@id="search_form"]/div[4]/div/div/div[2]/div/table/tbody/tr[1]/td[5]/span'); + + // ステータスで詳細検索 + + LoginHistoryPage::go($I)->検索(); + + $I->see('失敗', '//*[@id="search_form"]/div[4]/div/div/div[2]/div/table/tbody'); + $I->see('成功', '//*[@id="search_form"]/div[4]/div/div/div[2]/div/table/tbody'); + + LoginHistoryPage::go($I)->詳細検索_ステータス('0'); + + $I->see('失敗', '//*[@id="search_form"]/div[4]/div/div/div[2]/div/table/tbody'); + $I->dontSee('成功', '//*[@id="search_form"]/div[4]/div/div/div[2]/div/table/tbody'); + } + /** * ATTENTION 後続のテストが失敗するため、最後に実行する必要がある */ - public function systeminfo_セキュリティ管理IP制限(AcceptanceTester $I) + public function systeminfo_セキュリティ管理IP制限_許可リスト(AcceptanceTester $I) { - $I->wantTo('EA0804-UC01-T03 セキュリティ管理 - IP制限'); + $I->wantTo('EA0804-UC01-T03 セキュリティ管理 - IP制限（許可リスト）'); $findPlugins = Fixtures::get('findPlugins'); $Plugins = $findPlugins(); diff --git a/composer.json b/composer.json index 01bc8070097..adfb2144b94 100644 --- a/composer.json +++ b/composer.json @@ -114,7 +114,7 @@ "dama/doctrine-test-bundle": "^5.0", "fzaninotto/faker": "^1.7", "mikey179/vfsstream": "^1.6", - "php-coveralls/php-coveralls": "^2.1", + "phpstan/phpstan": "^0.12", "symfony/browser-kit": "^4.4", "symfony/phpunit-bridge": "^4.4" }, diff --git a/composer.lock b/composer.lock index 7b77806c19d..c959ce340dc 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "31acec37e3345fca7ffab9808662f7b4", + "content-hash": "0404d3935ec872bb06ecc78baaceecf8", "packages": [ { "name": "composer/ca-bundle", @@ -10529,89 +10529,6 @@ }, "time": "2018-07-08T19:19:57+00:00" }, - { - "name": "php-coveralls/php-coveralls", - "version": "v2.4.1", - "source": { - "type": "git", - "url": "https://github.com/php-coveralls/php-coveralls.git", - "reference": "c3f682e7cd50191ce0a9c396bc4dee8cbcf05383" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-coveralls/php-coveralls/zipball/c3f682e7cd50191ce0a9c396bc4dee8cbcf05383", - "reference": "c3f682e7cd50191ce0a9c396bc4dee8cbcf05383", - "shasum": "" - }, - "require": { - "ext-json": "*", - "ext-simplexml": "*", - "guzzlehttp/guzzle": "^6.0 || ^7.0", - "php": "^5.5 || ^7.0 || ^8.0", - "psr/log": "^1.0", - "symfony/config": "^2.1 || ^3.0 || ^4.0 || ^5.0", - "symfony/console": "^2.1 || ^3.0 || ^4.0 || ^5.0", - "symfony/stopwatch": "^2.0 || ^3.0 || ^4.0 || ^5.0", - "symfony/yaml": "^2.0.5 || ^3.0 || ^4.0 || ^5.0" - }, - "require-dev": { - "phpunit/phpunit": "^4.8.35 || ^5.4.3 || ^6.0 || ^7.0 || ^8.0 || ^9.0", - "sanmai/phpunit-legacy-adapter": "^6.1 || ^8.0" - }, - "suggest": { - "symfony/http-kernel": "Allows Symfony integration" - }, - "bin": [ - "bin/php-coveralls" - ], - "type": "library", - "autoload": { - "psr-4": { - "PhpCoveralls\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Kitamura Satoshi", - "email": "with.no.parachute@gmail.com", - "homepage": "https://www.facebook.com/satooshi.jp", - "role": "Original creator" - }, - { - "name": "Takashi Matsuo", - "email": "tmatsuo@google.com" - }, - { - "name": "Google Inc" - }, - { - "name": "Dariusz Ruminski", - "email": "dariusz.ruminski@gmail.com", - "homepage": "https://github.com/keradus" - }, - { - "name": "Contributors", - "homepage": "https://github.com/php-coveralls/php-coveralls/graphs/contributors" - } - ], - "description": "PHP client library for Coveralls API", - "homepage": "https://github.com/php-coveralls/php-coveralls", - "keywords": [ - "ci", - "coverage", - "github", - "test" - ], - "support": { - "issues": "https://github.com/php-coveralls/php-coveralls/issues", - "source": "https://github.com/php-coveralls/php-coveralls/tree/v2.4.1" - }, - "time": "2020-10-05T23:08:28+00:00" - }, { "name": "php-webdriver/webdriver", "version": "1.10.0", @@ -10910,6 +10827,66 @@ }, "time": "2020-03-05T15:02:03+00:00" }, + { + "name": "phpstan/phpstan", + "version": "0.12.83", + "source": { + "type": "git", + "url": "https://github.com/phpstan/phpstan.git", + "reference": "4a967cec6efb46b500dd6d768657336a3ffe699f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/4a967cec6efb46b500dd6d768657336a3ffe699f", + "reference": "4a967cec6efb46b500dd6d768657336a3ffe699f", + "shasum": "" + }, + "require": { + "php": "^7.1|^8.0" + }, + "conflict": { + "phpstan/phpstan-shim": "*" + }, + "bin": [ + "phpstan", + "phpstan.phar" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "0.12-dev" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "PHPStan - PHP Static Analysis Tool", + "support": { + "issues": "https://github.com/phpstan/phpstan/issues", + "source": "https://github.com/phpstan/phpstan/tree/0.12.83" + }, + "funding": [ + { + "url": "https://github.com/ondrejmirtes", + "type": "github" + }, + { + "url": "https://www.patreon.com/phpstan", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/phpstan/phpstan", + "type": "tidelift" + } + ], + "time": "2021-04-03T15:35:45+00:00" + }, { "name": "phpunit/php-code-coverage", "version": "6.1.4", diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml new file mode 100644 index 00000000000..eee9a9585f7 --- /dev/null +++ b/docker-compose.dev.yml @@ -0,0 +1,6 @@ +version: '3' + +services: + ec-cube: + volumes: + - ".:/var/www/html:cached" diff --git a/docker-compose.mysql.yml b/docker-compose.mysql.yml new file mode 100644 index 00000000000..ec087149863 --- /dev/null +++ b/docker-compose.mysql.yml @@ -0,0 +1,27 @@ +version: '3' + +volumes: + mysql-database: + driver: local + +services: + ec-cube: + depends_on: + - mysql + environment: + DATABASE_URL: "mysql://dbuser:secret@mysql/eccubedb" + DATABASE_SERVER_VERSION: 10 + + mysql: + image: mysql:5.7 + environment: + MYSQL_ROOT_PASSWORD: root + MYSQL_DATABASE: eccubedb + MYSQL_USER: dbuser + MYSQL_PASSWORD: secret + volumes: + - mysql-database:/var/lib/mysql + ports: + - 13306:3306 + networks: + - backend diff --git a/docker-compose.owaspzap.yml b/docker-compose.owaspzap.yml new file mode 100644 index 00000000000..220d7802c6b --- /dev/null +++ b/docker-compose.owaspzap.yml @@ -0,0 +1,19 @@ +version: "3" + +services: + zap: + build: + context: ./zap + command: bash -c "zap.sh -cmd -addonupdate -addoninstall help_ja_JP -addoninstall wappalyzer -addoninstall sequence -addonuninstall hud -configfile /zap/wrk/options.properties -certpubdump /zap/wrk/owasp_zap_root_ca.cer && zap-webswing.sh" + # 詳細スキャンしたい場合はこちらを使用する command: bash -c "zap.sh -cmd -addonupdate -addoninstall help_ja_JP -addoninstall wappalyzer -addoninstall ascanrulesAlpha -addoninstall ascanrulesBeta -addoninstall sqliplugin -addoninstall sequence -addonuninstall hud -configfile /zap/wrk/options.properties -certpubdump /zap/wrk/owasp_zap_root_ca.cer && zap-webswing.sh" + volumes: + - ./zap:/zap/wrk/ + ports: + - "8081:8080" + - "8090:8090" + depends_on: + - ec-cube + networks: + - backend + - default + tty: true diff --git a/docker-compose.pgsql.yml b/docker-compose.pgsql.yml new file mode 100644 index 00000000000..6b447faffb4 --- /dev/null +++ b/docker-compose.pgsql.yml @@ -0,0 +1,26 @@ +version: '3' + +volumes: + pg-database: + driver: local + +services: + ec-cube: + depends_on: + - postgres + environment: + DATABASE_URL: "postgres://dbuser:secret@postgres/eccubedb" + DATABASE_SERVER_VERSION: 10 + + postgres: + image: postgres:10 + environment: + POSTGRES_DB: eccubedb + POSTGRES_USER: dbuser + POSTGRES_PASSWORD: secret + ports: + - 15432:5432 + volumes: + - pg-database:/var/lib/postgresql/data + networks: + - backend diff --git a/docker-compose.yml b/docker-compose.yml index c53a14a1ca5..1100fec6161 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,10 +5,6 @@ networks: driver: bridge volumes: - pg-database: - driver: local - mysql-database: - driver: local mailcatcher-data: driver: local @@ -33,40 +29,32 @@ services: - 8080:80 - 4430:443 volumes: - - ".:/var/www/html:cached" ### 同期対象からコストの重いフォルダを除外 ##################### - "var:/var/www/html/var" - "vendor:/var/www/html/vendor" - "node_modules:/var/www/html/node_modules" - networks: - - backend - - ### Postgres ################################ - postgres: - image: postgres:10 environment: - - POSTGRES_DB=eccubedb - - POSTGRES_USER=dbuser - - POSTGRES_PASSWORD=secret - ports: - - 15432:5432 - volumes: - - pg-database:/var/lib/postgresql/data - networks: - - backend - - ### MySQL ################################## - mysql: - image: mysql:5.7 - environment: - MYSQL_ROOT_PASSWORD: root - MYSQL_DATABASE: eccubedb - MYSQL_USER: dbuser - MYSQL_PASSWORD: secret - volumes: - - mysql-database:/var/lib/mysql - ports: - - 13306:3306 + # EC-CUBE environments + APP_ENV: "dev" + APP_DEBUG: 1 + DATABASE_URL: "sqlite:///var/eccube.db" + DATABASE_SERVER_VERSION: 3 + MAILER_URL: "smtp://mailcatcher:1025" + ECCUBE_AUTH_MAGIC: "" + # ECCUBE_LOCALE: "ja" + # ECCUBE_TIMEZONE: "Asia/Tokyo" + # ECCUBE_CURRENCY: "JPY" + # ECCUBE_ADMIN_ROUTE: "admin" + # ECCUBE_USER_DATA_ROUTE: "user_data" + # ECCUBE_ADMIN_ALLOW_HOSTS: [] + # ECCUBE_FORCE_SSL: false + # ECCUBE_TEMPLATE_CODE: "default" + # ECCUBE_COOKIE_NAME: "eccube" + # ECCUBE_COOKIE_PATH: "/" + # ECCUBE_COOKIE_LIFETIME: 0 + # ECCUBE_GC_MAXLIFETIME: 1440 + # ECCUBE_ADMIN_USER: "admin" + # ECCUBE_ADMIN_PASS: "password" networks: - backend diff --git a/dockerbuild/docker-php-entrypoint b/dockerbuild/docker-php-entrypoint new file mode 100755 index 00000000000..f11dcfba8b3 --- /dev/null +++ b/dockerbuild/docker-php-entrypoint @@ -0,0 +1,13 @@ +#!/bin/sh +set -e + +if [ -n "${APP_ENV}" ]; then + echo "SetEnv APP_ENV ${APP_ENV}" >> /etc/apache2/conf-enabled/app_env.conf +fi + +# first arg is `-f` or `--some-option` +if [ "${1#-}" != "$1" ]; then + set -- apache2-foreground "$@" +fi + +exec "$@" diff --git a/dockerbuild/php.ini b/dockerbuild/php.ini index bdd92b0a04f..6491889bd9a 100644 --- a/dockerbuild/php.ini +++ b/dockerbuild/php.ini @@ -3,4 +3,4 @@ opcache.max_accelerated_files = 20000 opcache.memory_consumption=256 realpath_cache_size = 4096K realpath_cache_ttl = 600 -memory_limit = 512M +memory_limit = 786M diff --git a/html/template/admin/assets/pdf/logo.png b/html/template/admin/assets/pdf/logo.png index 27e95c202a6..886fa223725 100644 Binary files a/html/template/admin/assets/pdf/logo.png and b/html/template/admin/assets/pdf/logo.png differ diff --git a/html/template/default/assets/js/eccube.js b/html/template/default/assets/js/eccube.js index 258a761635d..dcd05eeafd3 100644 --- a/html/template/default/assets/js/eccube.js +++ b/html/template/default/assets/js/eccube.js @@ -92,26 +92,26 @@ var $cartbtn = $form.parent().find('.add-cart').first(); if (typeof this.product_cart_origin === 'undefined') { // 初期値を保持しておく - this.product_cart_origin = $cartbtn.text(); + this.product_cart_origin = $cartbtn.html(); } $cartbtn.prop('disabled', false); - $cartbtn.text(this.product_cart_origin); + $cartbtn.html(this.product_cart_origin); // 通常価格 var $price01 = $form.parent().find('.price01-default').first(); if (typeof this.price01_origin === 'undefined') { // 初期値を保持しておく - this.price01_origin = $price01.text(); + this.price01_origin = $price01.html(); } - $price01.text(this.price01_origin); + $price01.html(this.price01_origin); // 販売価格 var $price02 = $form.parent().find('.price02-default').first(); if (typeof price02_origin[product_id] === 'undefined') { // 初期値を保持しておく - price02_origin[product_id] = $price02.text(); + price02_origin[product_id] = $price02.html(); } - $price02.text(price02_origin[product_id]); + $price02.html(price02_origin[product_id]); // 商品規格 var $product_class_id_dynamic = $form.find('[id^=ProductClass]'); @@ -130,38 +130,38 @@ var $cartbtn = $form.parent().find('.add-cart').first(); if (typeof this.product_cart_origin === 'undefined') { // 初期値を保持しておく - this.product_cart_origin = $cartbtn.text(); + this.product_cart_origin = $cartbtn.html(); } if (classcat2 && classcat2.stock_find === false) { $cartbtn.prop('disabled', true); - $cartbtn.text('ただいま品切れ中です'); + $cartbtn.text(eccube_lang['front.product.out_of_stock']); } else { $cartbtn.prop('disabled', false); - $cartbtn.text(this.product_cart_origin); + $cartbtn.html(this.product_cart_origin); } // 通常価格 var $price01 = $form.parent().find('.price01-default').first(); if (typeof this.price01_origin === 'undefined') { // 初期値を保持しておく - this.price01_origin = $price01.text(); + this.price01_origin = $price01.html(); } if (classcat2 && typeof classcat2.price01_inc_tax !== 'undefined' && String(classcat2.price01_inc_tax).length >= 1) { - $price01.text('￥' + classcat2.price01_inc_tax); + $price01.text(classcat2.price01_inc_tax_with_currency); } else { - $price01.text(this.price01_origin); + $price01.html(this.price01_origin); } // 販売価格 var $price02 = $form.parent().find('.price02-default').first(); if (typeof price02_origin[product_id] === 'undefined') { // 初期値を保持しておく - price02_origin[product_id] = $price02.text(); + price02_origin[product_id] = $price02.html(); } if (classcat2 && typeof classcat2.price02_inc_tax !== 'undefined' && String(classcat2.price02_inc_tax).length >= 1) { - $price02.text('￥' + classcat2.price02_inc_tax); + $price02.text(classcat2.price02_inc_tax_with_currency); } else { - $price02.text(price02_origin[product_id]); + $price02.html(price02_origin[product_id]); } // ポイント diff --git a/html/template/install/assets/js/vendor/jquery-3.3.1.min.js b/html/template/install/assets/js/vendor/jquery-3.3.1.min.js deleted file mode 100644 index 4d9b3a25875..00000000000 --- a/html/template/install/assets/js/vendor/jquery-3.3.1.min.js +++ /dev/null @@ -1,2 +0,0 @@ -/*! jQuery v3.3.1 | (c) JS Foundation and other contributors | jquery.org/license */ -!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(e,t){"use strict";var n=[],r=e.document,i=Object.getPrototypeOf,o=n.slice,a=n.concat,s=n.push,u=n.indexOf,l={},c=l.toString,f=l.hasOwnProperty,p=f.toString,d=p.call(Object),h={},g=function e(t){return"function"==typeof t&&"number"!=typeof t.nodeType},y=function e(t){return null!=t&&t===t.window},v={type:!0,src:!0,noModule:!0};function m(e,t,n){var i,o=(t=t||r).createElement("script");if(o.text=e,n)for(i in v)n[i]&&(o[i]=n[i]);t.head.appendChild(o).parentNode.removeChild(o)}function x(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?l[c.call(e)]||"object":typeof e}var b="3.3.1",w=function(e,t){return new w.fn.init(e,t)},T=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g;w.fn=w.prototype={jquery:"3.3.1",constructor:w,length:0,toArray:function(){return o.call(this)},get:function(e){return null==e?o.call(this):e<0?this[e+this.length]:this[e]},pushStack:function(e){var t=w.merge(this.constructor(),e);return t.prevObject=this,t},each:function(e){return w.each(this,e)},map:function(e){return this.pushStack(w.map(this,function(t,n){return e.call(t,n,t)}))},slice:function(){return this.pushStack(o.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(e<0?t:0);return this.pushStack(n>=0&&n0&&t-1 in e)}var E=function(e){var t,n,r,i,o,a,s,u,l,c,f,p,d,h,g,y,v,m,x,b="sizzle"+1*new Date,w=e.document,T=0,C=0,E=ae(),k=ae(),S=ae(),D=function(e,t){return e===t&&(f=!0),0},N={}.hasOwnProperty,A=[],j=A.pop,q=A.push,L=A.push,H=A.slice,O=function(e,t){for(var n=0,r=e.length;n+~]|"+M+")"+M+"*"),z=new RegExp("="+M+"*([^\\]'\"]*?)"+M+"*\\]","g"),X=new RegExp(W),U=new RegExp("^"+R+"$"),V={ID:new RegExp("^#("+R+")"),CLASS:new RegExp("^\\.("+R+")"),TAG:new RegExp("^("+R+"|[*])"),ATTR:new RegExp("^"+I),PSEUDO:new RegExp("^"+W),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+P+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},G=/^(?:input|select|textarea|button)$/i,Y=/^h\d$/i,Q=/^[^{]+\{\s*\[native \w/,J=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,K=/[+~]/,Z=new RegExp("\\\\([\\da-f]{1,6}"+M+"?|("+M+")|.)","ig"),ee=function(e,t,n){var r="0x"+t-65536;return r!==r||n?t:r<0?String.fromCharCode(r+65536):String.fromCharCode(r>>10|55296,1023&r|56320)},te=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ne=function(e,t){return t?"\0"===e?"\ufffd":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},re=function(){p()},ie=me(function(e){return!0===e.disabled&&("form"in e||"label"in e)},{dir:"parentNode",next:"legend"});try{L.apply(A=H.call(w.childNodes),w.childNodes),A[w.childNodes.length].nodeType}catch(e){L={apply:A.length?function(e,t){q.apply(e,H.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function oe(e,t,r,i){var o,s,l,c,f,h,v,m=t&&t.ownerDocument,T=t?t.nodeType:9;if(r=r||[],"string"!=typeof e||!e||1!==T&&9!==T&&11!==T)return r;if(!i&&((t?t.ownerDocument||t:w)!==d&&p(t),t=t||d,g)){if(11!==T&&(f=J.exec(e)))if(o=f[1]){if(9===T){if(!(l=t.getElementById(o)))return r;if(l.id===o)return r.push(l),r}else if(m&&(l=m.getElementById(o))&&x(t,l)&&l.id===o)return r.push(l),r}else{if(f[2])return L.apply(r,t.getElementsByTagName(e)),r;if((o=f[3])&&n.getElementsByClassName&&t.getElementsByClassName)return L.apply(r,t.getElementsByClassName(o)),r}if(n.qsa&&!S[e+" "]&&(!y||!y.test(e))){if(1!==T)m=t,v=e;else if("object"!==t.nodeName.toLowerCase()){(c=t.getAttribute("id"))?c=c.replace(te,ne):t.setAttribute("id",c=b),s=(h=a(e)).length;while(s--)h[s]="#"+c+" "+ve(h[s]);v=h.join(","),m=K.test(e)&&ge(t.parentNode)||t}if(v)try{return L.apply(r,m.querySelectorAll(v)),r}catch(e){}finally{c===b&&t.removeAttribute("id")}}}return u(e.replace(B,"$1"),t,r,i)}function ae(){var e=[];function t(n,i){return e.push(n+" ")>r.cacheLength&&delete t[e.shift()],t[n+" "]=i}return t}function se(e){return e[b]=!0,e}function ue(e){var t=d.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function le(e,t){var n=e.split("|"),i=n.length;while(i--)r.attrHandle[n[i]]=t}function ce(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&e.sourceIndex-t.sourceIndex;if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function fe(e){return function(t){return"input"===t.nodeName.toLowerCase()&&t.type===e}}function pe(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n||"button"===n)&&t.type===e}}function de(e){return function(t){return"form"in t?t.parentNode&&!1===t.disabled?"label"in t?"label"in t.parentNode?t.parentNode.disabled===e:t.disabled===e:t.isDisabled===e||t.isDisabled!==!e&&ie(t)===e:t.disabled===e:"label"in t&&t.disabled===e}}function he(e){return se(function(t){return t=+t,se(function(n,r){var i,o=e([],n.length,t),a=o.length;while(a--)n[i=o[a]]&&(n[i]=!(r[i]=n[i]))})})}function ge(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}n=oe.support={},o=oe.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return!!t&&"HTML"!==t.nodeName},p=oe.setDocument=function(e){var t,i,a=e?e.ownerDocument||e:w;return a!==d&&9===a.nodeType&&a.documentElement?(d=a,h=d.documentElement,g=!o(d),w!==d&&(i=d.defaultView)&&i.top!==i&&(i.addEventListener?i.addEventListener("unload",re,!1):i.attachEvent&&i.attachEvent("onunload",re)),n.attributes=ue(function(e){return e.className="i",!e.getAttribute("className")}),n.getElementsByTagName=ue(function(e){return e.appendChild(d.createComment("")),!e.getElementsByTagName("*").length}),n.getElementsByClassName=Q.test(d.getElementsByClassName),n.getById=ue(function(e){return h.appendChild(e).id=b,!d.getElementsByName||!d.getElementsByName(b).length}),n.getById?(r.filter.ID=function(e){var t=e.replace(Z,ee);return function(e){return e.getAttribute("id")===t}},r.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&g){var n=t.getElementById(e);return n?[n]:[]}}):(r.filter.ID=function(e){var t=e.replace(Z,ee);return function(e){var n="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return n&&n.value===t}},r.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&g){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),r.find.TAG=n.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):n.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},r.find.CLASS=n.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&g)return t.getElementsByClassName(e)},v=[],y=[],(n.qsa=Q.test(d.querySelectorAll))&&(ue(function(e){h.appendChild(e).innerHTML="",e.querySelectorAll("[msallowcapture^='']").length&&y.push("[*^$]="+M+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||y.push("\\["+M+"*(?:value|"+P+")"),e.querySelectorAll("[id~="+b+"-]").length||y.push("~="),e.querySelectorAll(":checked").length||y.push(":checked"),e.querySelectorAll("a#"+b+"+*").length||y.push(".#.+[+~]")}),ue(function(e){e.innerHTML="";var t=d.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&y.push("name"+M+"*[*^$|!~]?="),2!==e.querySelectorAll(":enabled").length&&y.push(":enabled",":disabled"),h.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&y.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),y.push(",.*:")})),(n.matchesSelector=Q.test(m=h.matches||h.webkitMatchesSelector||h.mozMatchesSelector||h.oMatchesSelector||h.msMatchesSelector))&&ue(function(e){n.disconnectedMatch=m.call(e,"*"),m.call(e,"[s!='']:x"),v.push("!=",W)}),y=y.length&&new RegExp(y.join("|")),v=v.length&&new RegExp(v.join("|")),t=Q.test(h.compareDocumentPosition),x=t||Q.test(h.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},D=t?function(e,t){if(e===t)return f=!0,0;var r=!e.compareDocumentPosition-!t.compareDocumentPosition;return r||(1&(r=(e.ownerDocument||e)===(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!n.sortDetached&&t.compareDocumentPosition(e)===r?e===d||e.ownerDocument===w&&x(w,e)?-1:t===d||t.ownerDocument===w&&x(w,t)?1:c?O(c,e)-O(c,t):0:4&r?-1:1)}:function(e,t){if(e===t)return f=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,a=[e],s=[t];if(!i||!o)return e===d?-1:t===d?1:i?-1:o?1:c?O(c,e)-O(c,t):0;if(i===o)return ce(e,t);n=e;while(n=n.parentNode)a.unshift(n);n=t;while(n=n.parentNode)s.unshift(n);while(a[r]===s[r])r++;return r?ce(a[r],s[r]):a[r]===w?-1:s[r]===w?1:0},d):d},oe.matches=function(e,t){return oe(e,null,null,t)},oe.matchesSelector=function(e,t){if((e.ownerDocument||e)!==d&&p(e),t=t.replace(z,"='$1']"),n.matchesSelector&&g&&!S[t+" "]&&(!v||!v.test(t))&&(!y||!y.test(t)))try{var r=m.call(e,t);if(r||n.disconnectedMatch||e.document&&11!==e.document.nodeType)return r}catch(e){}return oe(t,d,null,[e]).length>0},oe.contains=function(e,t){return(e.ownerDocument||e)!==d&&p(e),x(e,t)},oe.attr=function(e,t){(e.ownerDocument||e)!==d&&p(e);var i=r.attrHandle[t.toLowerCase()],o=i&&N.call(r.attrHandle,t.toLowerCase())?i(e,t,!g):void 0;return void 0!==o?o:n.attributes||!g?e.getAttribute(t):(o=e.getAttributeNode(t))&&o.specified?o.value:null},oe.escape=function(e){return(e+"").replace(te,ne)},oe.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},oe.uniqueSort=function(e){var t,r=[],i=0,o=0;if(f=!n.detectDuplicates,c=!n.sortStable&&e.slice(0),e.sort(D),f){while(t=e[o++])t===e[o]&&(i=r.push(o));while(i--)e.splice(r[i],1)}return c=null,e},i=oe.getText=function(e){var t,n="",r=0,o=e.nodeType;if(o){if(1===o||9===o||11===o){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=i(e)}else if(3===o||4===o)return e.nodeValue}else while(t=e[r++])n+=i(t);return n},(r=oe.selectors={cacheLength:50,createPseudo:se,match:V,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(Z,ee),e[3]=(e[3]||e[4]||e[5]||"").replace(Z,ee),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||oe.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&oe.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return V.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&X.test(n)&&(t=a(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(Z,ee).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=E[e+" "];return t||(t=new RegExp("(^|"+M+")"+e+"("+M+"|$)"))&&E(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r){var i=oe.attr(r,e);return null==i?"!="===t:!t||(i+="","="===t?i===n:"!="===t?i!==n:"^="===t?n&&0===i.indexOf(n):"*="===t?n&&i.indexOf(n)>-1:"$="===t?n&&i.slice(-n.length)===n:"~="===t?(" "+i.replace($," ")+" ").indexOf(n)>-1:"|="===t&&(i===n||i.slice(0,n.length+1)===n+"-"))}},CHILD:function(e,t,n,r,i){var o="nth"!==e.slice(0,3),a="last"!==e.slice(-4),s="of-type"===t;return 1===r&&0===i?function(e){return!!e.parentNode}:function(t,n,u){var l,c,f,p,d,h,g=o!==a?"nextSibling":"previousSibling",y=t.parentNode,v=s&&t.nodeName.toLowerCase(),m=!u&&!s,x=!1;if(y){if(o){while(g){p=t;while(p=p[g])if(s?p.nodeName.toLowerCase()===v:1===p.nodeType)return!1;h=g="only"===e&&!h&&"nextSibling"}return!0}if(h=[a?y.firstChild:y.lastChild],a&&m){x=(d=(l=(c=(f=(p=y)[b]||(p[b]={}))[p.uniqueID]||(f[p.uniqueID]={}))[e]||[])[0]===T&&l[1])&&l[2],p=d&&y.childNodes[d];while(p=++d&&p&&p[g]||(x=d=0)||h.pop())if(1===p.nodeType&&++x&&p===t){c[e]=[T,d,x];break}}else if(m&&(x=d=(l=(c=(f=(p=t)[b]||(p[b]={}))[p.uniqueID]||(f[p.uniqueID]={}))[e]||[])[0]===T&&l[1]),!1===x)while(p=++d&&p&&p[g]||(x=d=0)||h.pop())if((s?p.nodeName.toLowerCase()===v:1===p.nodeType)&&++x&&(m&&((c=(f=p[b]||(p[b]={}))[p.uniqueID]||(f[p.uniqueID]={}))[e]=[T,x]),p===t))break;return(x-=i)===r||x%r==0&&x/r>=0}}},PSEUDO:function(e,t){var n,i=r.pseudos[e]||r.setFilters[e.toLowerCase()]||oe.error("unsupported pseudo: "+e);return i[b]?i(t):i.length>1?(n=[e,e,"",t],r.setFilters.hasOwnProperty(e.toLowerCase())?se(function(e,n){var r,o=i(e,t),a=o.length;while(a--)e[r=O(e,o[a])]=!(n[r]=o[a])}):function(e){return i(e,0,n)}):i}},pseudos:{not:se(function(e){var t=[],n=[],r=s(e.replace(B,"$1"));return r[b]?se(function(e,t,n,i){var o,a=r(e,null,i,[]),s=e.length;while(s--)(o=a[s])&&(e[s]=!(t[s]=o))}):function(e,i,o){return t[0]=e,r(t,null,o,n),t[0]=null,!n.pop()}}),has:se(function(e){return function(t){return oe(e,t).length>0}}),contains:se(function(e){return e=e.replace(Z,ee),function(t){return(t.textContent||t.innerText||i(t)).indexOf(e)>-1}}),lang:se(function(e){return U.test(e||"")||oe.error("unsupported lang: "+e),e=e.replace(Z,ee).toLowerCase(),function(t){var n;do{if(n=g?t.lang:t.getAttribute("xml:lang")||t.getAttribute("lang"))return(n=n.toLowerCase())===e||0===n.indexOf(e+"-")}while((t=t.parentNode)&&1===t.nodeType);return!1}}),target:function(t){var n=e.location&&e.location.hash;return n&&n.slice(1)===t.id},root:function(e){return e===h},focus:function(e){return e===d.activeElement&&(!d.hasFocus||d.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:de(!1),disabled:de(!0),checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,!0===e.selected},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeType<6)return!1;return!0},parent:function(e){return!r.pseudos.empty(e)},header:function(e){return Y.test(e.nodeName)},input:function(e){return G.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||"text"===t.toLowerCase())},first:he(function(){return[0]}),last:he(function(e,t){return[t-1]}),eq:he(function(e,t,n){return[n<0?n+t:n]}),even:he(function(e,t){for(var n=0;n=0;)e.push(r);return e}),gt:he(function(e,t,n){for(var r=n<0?n+t:n;++r1?function(t,n,r){var i=e.length;while(i--)if(!e[i](t,n,r))return!1;return!0}:e[0]}function be(e,t,n){for(var r=0,i=t.length;r-1&&(o[l]=!(a[l]=f))}}else v=we(v===a?v.splice(h,v.length):v),i?i(null,a,v,u):L.apply(a,v)})}function Ce(e){for(var t,n,i,o=e.length,a=r.relative[e[0].type],s=a||r.relative[" "],u=a?1:0,c=me(function(e){return e===t},s,!0),f=me(function(e){return O(t,e)>-1},s,!0),p=[function(e,n,r){var i=!a&&(r||n!==l)||((t=n).nodeType?c(e,n,r):f(e,n,r));return t=null,i}];u1&&xe(p),u>1&&ve(e.slice(0,u-1).concat({value:" "===e[u-2].type?"*":""})).replace(B,"$1"),n,u0,i=e.length>0,o=function(o,a,s,u,c){var f,h,y,v=0,m="0",x=o&&[],b=[],w=l,C=o||i&&r.find.TAG("*",c),E=T+=null==w?1:Math.random()||.1,k=C.length;for(c&&(l=a===d||a||c);m!==k&&null!=(f=C[m]);m++){if(i&&f){h=0,a||f.ownerDocument===d||(p(f),s=!g);while(y=e[h++])if(y(f,a||d,s)){u.push(f);break}c&&(T=E)}n&&((f=!y&&f)&&v--,o&&x.push(f))}if(v+=m,n&&m!==v){h=0;while(y=t[h++])y(x,b,a,s);if(o){if(v>0)while(m--)x[m]||b[m]||(b[m]=j.call(u));b=we(b)}L.apply(u,b),c&&!o&&b.length>0&&v+t.length>1&&oe.uniqueSort(u)}return c&&(T=E,l=w),x};return n?se(o):o}return s=oe.compile=function(e,t){var n,r=[],i=[],o=S[e+" "];if(!o){t||(t=a(e)),n=t.length;while(n--)(o=Ce(t[n]))[b]?r.push(o):i.push(o);(o=S(e,Ee(i,r))).selector=e}return o},u=oe.select=function(e,t,n,i){var o,u,l,c,f,p="function"==typeof e&&e,d=!i&&a(e=p.selector||e);if(n=n||[],1===d.length){if((u=d[0]=d[0].slice(0)).length>2&&"ID"===(l=u[0]).type&&9===t.nodeType&&g&&r.relative[u[1].type]){if(!(t=(r.find.ID(l.matches[0].replace(Z,ee),t)||[])[0]))return n;p&&(t=t.parentNode),e=e.slice(u.shift().value.length)}o=V.needsContext.test(e)?0:u.length;while(o--){if(l=u[o],r.relative[c=l.type])break;if((f=r.find[c])&&(i=f(l.matches[0].replace(Z,ee),K.test(u[0].type)&&ge(t.parentNode)||t))){if(u.splice(o,1),!(e=i.length&&ve(u)))return L.apply(n,i),n;break}}}return(p||s(e,d))(i,t,!g,n,!t||K.test(e)&&ge(t.parentNode)||t),n},n.sortStable=b.split("").sort(D).join("")===b,n.detectDuplicates=!!f,p(),n.sortDetached=ue(function(e){return 1&e.compareDocumentPosition(d.createElement("fieldset"))}),ue(function(e){return e.innerHTML="","#"===e.firstChild.getAttribute("href")})||le("type|href|height|width",function(e,t,n){if(!n)return e.getAttribute(t,"type"===t.toLowerCase()?1:2)}),n.attributes&&ue(function(e){return e.innerHTML="",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||le("value",function(e,t,n){if(!n&&"input"===e.nodeName.toLowerCase())return e.defaultValue}),ue(function(e){return null==e.getAttribute("disabled")})||le(P,function(e,t,n){var r;if(!n)return!0===e[t]?t.toLowerCase():(r=e.getAttributeNode(t))&&r.specified?r.value:null}),oe}(e);w.find=E,w.expr=E.selectors,w.expr[":"]=w.expr.pseudos,w.uniqueSort=w.unique=E.uniqueSort,w.text=E.getText,w.isXMLDoc=E.isXML,w.contains=E.contains,w.escapeSelector=E.escape;var k=function(e,t,n){var r=[],i=void 0!==n;while((e=e[t])&&9!==e.nodeType)if(1===e.nodeType){if(i&&w(e).is(n))break;r.push(e)}return r},S=function(e,t){for(var n=[];e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n},D=w.expr.match.needsContext;function N(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()}var A=/^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function j(e,t,n){return g(t)?w.grep(e,function(e,r){return!!t.call(e,r,e)!==n}):t.nodeType?w.grep(e,function(e){return e===t!==n}):"string"!=typeof t?w.grep(e,function(e){return u.call(t,e)>-1!==n}):w.filter(t,e,n)}w.filter=function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?w.find.matchesSelector(r,e)?[r]:[]:w.find.matches(e,w.grep(t,function(e){return 1===e.nodeType}))},w.fn.extend({find:function(e){var t,n,r=this.length,i=this;if("string"!=typeof e)return this.pushStack(w(e).filter(function(){for(t=0;t1?w.uniqueSort(n):n},filter:function(e){return this.pushStack(j(this,e||[],!1))},not:function(e){return this.pushStack(j(this,e||[],!0))},is:function(e){return!!j(this,"string"==typeof e&&D.test(e)?w(e):e||[],!1).length}});var q,L=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/;(w.fn.init=function(e,t,n){var i,o;if(!e)return this;if(n=n||q,"string"==typeof e){if(!(i="<"===e[0]&&">"===e[e.length-1]&&e.length>=3?[null,e,null]:L.exec(e))||!i[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(i[1]){if(t=t instanceof w?t[0]:t,w.merge(this,w.parseHTML(i[1],t&&t.nodeType?t.ownerDocument||t:r,!0)),A.test(i[1])&&w.isPlainObject(t))for(i in t)g(this[i])?this[i](t[i]):this.attr(i,t[i]);return this}return(o=r.getElementById(i[2]))&&(this[0]=o,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):g(e)?void 0!==n.ready?n.ready(e):e(w):w.makeArray(e,this)}).prototype=w.fn,q=w(r);var H=/^(?:parents|prev(?:Until|All))/,O={children:!0,contents:!0,next:!0,prev:!0};w.fn.extend({has:function(e){var t=w(e,this),n=t.length;return this.filter(function(){for(var e=0;e-1:1===n.nodeType&&w.find.matchesSelector(n,e))){o.push(n);break}return this.pushStack(o.length>1?w.uniqueSort(o):o)},index:function(e){return e?"string"==typeof e?u.call(w(e),this[0]):u.call(this,e.jquery?e[0]:e):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){return this.pushStack(w.uniqueSort(w.merge(this.get(),w(e,t))))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}});function P(e,t){while((e=e[t])&&1!==e.nodeType);return e}w.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return k(e,"parentNode")},parentsUntil:function(e,t,n){return k(e,"parentNode",n)},next:function(e){return P(e,"nextSibling")},prev:function(e){return P(e,"previousSibling")},nextAll:function(e){return k(e,"nextSibling")},prevAll:function(e){return k(e,"previousSibling")},nextUntil:function(e,t,n){return k(e,"nextSibling",n)},prevUntil:function(e,t,n){return k(e,"previousSibling",n)},siblings:function(e){return S((e.parentNode||{}).firstChild,e)},children:function(e){return S(e.firstChild)},contents:function(e){return N(e,"iframe")?e.contentDocument:(N(e,"template")&&(e=e.content||e),w.merge([],e.childNodes))}},function(e,t){w.fn[e]=function(n,r){var i=w.map(this,t,n);return"Until"!==e.slice(-5)&&(r=n),r&&"string"==typeof r&&(i=w.filter(r,i)),this.length>1&&(O[e]||w.uniqueSort(i),H.test(e)&&i.reverse()),this.pushStack(i)}});var M=/[^\x20\t\r\n\f]+/g;function R(e){var t={};return w.each(e.match(M)||[],function(e,n){t[n]=!0}),t}w.Callbacks=function(e){e="string"==typeof e?R(e):w.extend({},e);var t,n,r,i,o=[],a=[],s=-1,u=function(){for(i=i||e.once,r=t=!0;a.length;s=-1){n=a.shift();while(++s-1)o.splice(n,1),n<=s&&s--}),this},has:function(e){return e?w.inArray(e,o)>-1:o.length>0},empty:function(){return o&&(o=[]),this},disable:function(){return i=a=[],o=n="",this},disabled:function(){return!o},lock:function(){return i=a=[],n||t||(o=n=""),this},locked:function(){return!!i},fireWith:function(e,n){return i||(n=[e,(n=n||[]).slice?n.slice():n],a.push(n),t||u()),this},fire:function(){return l.fireWith(this,arguments),this},fired:function(){return!!r}};return l};function I(e){return e}function W(e){throw e}function $(e,t,n,r){var i;try{e&&g(i=e.promise)?i.call(e).done(t).fail(n):e&&g(i=e.then)?i.call(e,t,n):t.apply(void 0,[e].slice(r))}catch(e){n.apply(void 0,[e])}}w.extend({Deferred:function(t){var n=[["notify","progress",w.Callbacks("memory"),w.Callbacks("memory"),2],["resolve","done",w.Callbacks("once memory"),w.Callbacks("once memory"),0,"resolved"],["reject","fail",w.Callbacks("once memory"),w.Callbacks("once memory"),1,"rejected"]],r="pending",i={state:function(){return r},always:function(){return o.done(arguments).fail(arguments),this},"catch":function(e){return i.then(null,e)},pipe:function(){var e=arguments;return w.Deferred(function(t){w.each(n,function(n,r){var i=g(e[r[4]])&&e[r[4]];o[r[1]](function(){var e=i&&i.apply(this,arguments);e&&g(e.promise)?e.promise().progress(t.notify).done(t.resolve).fail(t.reject):t[r[0]+"With"](this,i?[e]:arguments)})}),e=null}).promise()},then:function(t,r,i){var o=0;function a(t,n,r,i){return function(){var s=this,u=arguments,l=function(){var e,l;if(!(t=o&&(r!==W&&(s=void 0,u=[e]),n.rejectWith(s,u))}};t?c():(w.Deferred.getStackHook&&(c.stackTrace=w.Deferred.getStackHook()),e.setTimeout(c))}}return w.Deferred(function(e){n[0][3].add(a(0,e,g(i)?i:I,e.notifyWith)),n[1][3].add(a(0,e,g(t)?t:I)),n[2][3].add(a(0,e,g(r)?r:W))}).promise()},promise:function(e){return null!=e?w.extend(e,i):i}},o={};return w.each(n,function(e,t){var a=t[2],s=t[5];i[t[1]]=a.add,s&&a.add(function(){r=s},n[3-e][2].disable,n[3-e][3].disable,n[0][2].lock,n[0][3].lock),a.add(t[3].fire),o[t[0]]=function(){return o[t[0]+"With"](this===o?void 0:this,arguments),this},o[t[0]+"With"]=a.fireWith}),i.promise(o),t&&t.call(o,o),o},when:function(e){var t=arguments.length,n=t,r=Array(n),i=o.call(arguments),a=w.Deferred(),s=function(e){return function(n){r[e]=this,i[e]=arguments.length>1?o.call(arguments):n,--t||a.resolveWith(r,i)}};if(t<=1&&($(e,a.done(s(n)).resolve,a.reject,!t),"pending"===a.state()||g(i[n]&&i[n].then)))return a.then();while(n--)$(i[n],s(n),a.reject);return a.promise()}});var B=/^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;w.Deferred.exceptionHook=function(t,n){e.console&&e.console.warn&&t&&B.test(t.name)&&e.console.warn("jQuery.Deferred exception: "+t.message,t.stack,n)},w.readyException=function(t){e.setTimeout(function(){throw t})};var F=w.Deferred();w.fn.ready=function(e){return F.then(e)["catch"](function(e){w.readyException(e)}),this},w.extend({isReady:!1,readyWait:1,ready:function(e){(!0===e?--w.readyWait:w.isReady)||(w.isReady=!0,!0!==e&&--w.readyWait>0||F.resolveWith(r,[w]))}}),w.ready.then=F.then;function _(){r.removeEventListener("DOMContentLoaded",_),e.removeEventListener("load",_),w.ready()}"complete"===r.readyState||"loading"!==r.readyState&&!r.documentElement.doScroll?e.setTimeout(w.ready):(r.addEventListener("DOMContentLoaded",_),e.addEventListener("load",_));var z=function(e,t,n,r,i,o,a){var s=0,u=e.length,l=null==n;if("object"===x(n)){i=!0;for(s in n)z(e,t,s,n[s],!0,o,a)}else if(void 0!==r&&(i=!0,g(r)||(a=!0),l&&(a?(t.call(e,r),t=null):(l=t,t=function(e,t,n){return l.call(w(e),n)})),t))for(;s1,null,!0)},removeData:function(e){return this.each(function(){K.remove(this,e)})}}),w.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=J.get(e,t),n&&(!r||Array.isArray(n)?r=J.access(e,t,w.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=w.queue(e,t),r=n.length,i=n.shift(),o=w._queueHooks(e,t),a=function(){w.dequeue(e,t)};"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,a,o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return J.get(e,n)||J.access(e,n,{empty:w.Callbacks("once memory").add(function(){J.remove(e,[t+"queue",n])})})}}),w.fn.extend({queue:function(e,t){var n=2;return"string"!=typeof e&&(t=e,e="fx",n--),arguments.length\x20\t\r\n\f]+)/i,he=/^$|^module$|\/(?:java|ecma)script/i,ge={option:[1,""],thead:[1,"","
"],col:[2,"","
"],tr:[2,"","
"],td:[3,"","
"],_default:[0,"",""]};ge.optgroup=ge.option,ge.tbody=ge.tfoot=ge.colgroup=ge.caption=ge.thead,ge.th=ge.td;function ye(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&N(e,t)?w.merge([e],n):n}function ve(e,t){for(var n=0,r=e.length;n-1)i&&i.push(o);else if(l=w.contains(o.ownerDocument,o),a=ye(f.appendChild(o),"script"),l&&ve(a),n){c=0;while(o=a[c++])he.test(o.type||"")&&n.push(o)}return f}!function(){var e=r.createDocumentFragment().appendChild(r.createElement("div")),t=r.createElement("input");t.setAttribute("type","radio"),t.setAttribute("checked","checked"),t.setAttribute("name","t"),e.appendChild(t),h.checkClone=e.cloneNode(!0).cloneNode(!0).lastChild.checked,e.innerHTML="",h.noCloneChecked=!!e.cloneNode(!0).lastChild.defaultValue}();var be=r.documentElement,we=/^key/,Te=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,Ce=/^([^.]*)(?:\.(.+)|)/;function Ee(){return!0}function ke(){return!1}function Se(){try{return r.activeElement}catch(e){}}function De(e,t,n,r,i,o){var a,s;if("object"==typeof t){"string"!=typeof n&&(r=r||n,n=void 0);for(s in t)De(e,s,n,r,t[s],o);return e}if(null==r&&null==i?(i=n,r=n=void 0):null==i&&("string"==typeof n?(i=r,r=void 0):(i=r,r=n,n=void 0)),!1===i)i=ke;else if(!i)return e;return 1===o&&(a=i,(i=function(e){return w().off(e),a.apply(this,arguments)}).guid=a.guid||(a.guid=w.guid++)),e.each(function(){w.event.add(this,t,i,r,n)})}w.event={global:{},add:function(e,t,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,y=J.get(e);if(y){n.handler&&(n=(o=n).handler,i=o.selector),i&&w.find.matchesSelector(be,i),n.guid||(n.guid=w.guid++),(u=y.events)||(u=y.events={}),(a=y.handle)||(a=y.handle=function(t){return"undefined"!=typeof w&&w.event.triggered!==t.type?w.event.dispatch.apply(e,arguments):void 0}),l=(t=(t||"").match(M)||[""]).length;while(l--)d=g=(s=Ce.exec(t[l])||[])[1],h=(s[2]||"").split(".").sort(),d&&(f=w.event.special[d]||{},d=(i?f.delegateType:f.bindType)||d,f=w.event.special[d]||{},c=w.extend({type:d,origType:g,data:r,handler:n,guid:n.guid,selector:i,needsContext:i&&w.expr.match.needsContext.test(i),namespace:h.join(".")},o),(p=u[d])||((p=u[d]=[]).delegateCount=0,f.setup&&!1!==f.setup.call(e,r,h,a)||e.addEventListener&&e.addEventListener(d,a)),f.add&&(f.add.call(e,c),c.handler.guid||(c.handler.guid=n.guid)),i?p.splice(p.delegateCount++,0,c):p.push(c),w.event.global[d]=!0)}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,y=J.hasData(e)&&J.get(e);if(y&&(u=y.events)){l=(t=(t||"").match(M)||[""]).length;while(l--)if(s=Ce.exec(t[l])||[],d=g=s[1],h=(s[2]||"").split(".").sort(),d){f=w.event.special[d]||{},p=u[d=(r?f.delegateType:f.bindType)||d]||[],s=s[2]&&new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),a=o=p.length;while(o--)c=p[o],!i&&g!==c.origType||n&&n.guid!==c.guid||s&&!s.test(c.namespace)||r&&r!==c.selector&&("**"!==r||!c.selector)||(p.splice(o,1),c.selector&&p.delegateCount--,f.remove&&f.remove.call(e,c));a&&!p.length&&(f.teardown&&!1!==f.teardown.call(e,h,y.handle)||w.removeEvent(e,d,y.handle),delete u[d])}else for(d in u)w.event.remove(e,d+t[l],n,r,!0);w.isEmptyObject(u)&&J.remove(e,"handle events")}},dispatch:function(e){var t=w.event.fix(e),n,r,i,o,a,s,u=new Array(arguments.length),l=(J.get(this,"events")||{})[t.type]||[],c=w.event.special[t.type]||{};for(u[0]=t,n=1;n=1))for(;l!==this;l=l.parentNode||this)if(1===l.nodeType&&("click"!==e.type||!0!==l.disabled)){for(o=[],a={},n=0;n-1:w.find(i,this,null,[l]).length),a[i]&&o.push(r);o.length&&s.push({elem:l,handlers:o})}return l=this,u\x20\t\r\n\f]*)[^>]*)\/>/gi,Ae=/\s*$/g;function Le(e,t){return N(e,"table")&&N(11!==t.nodeType?t:t.firstChild,"tr")?w(e).children("tbody")[0]||e:e}function He(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function Oe(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Pe(e,t){var n,r,i,o,a,s,u,l;if(1===t.nodeType){if(J.hasData(e)&&(o=J.access(e),a=J.set(t,o),l=o.events)){delete a.handle,a.events={};for(i in l)for(n=0,r=l[i].length;n1&&"string"==typeof y&&!h.checkClone&&je.test(y))return e.each(function(i){var o=e.eq(i);v&&(t[0]=y.call(this,i,o.html())),Re(o,t,n,r)});if(p&&(i=xe(t,e[0].ownerDocument,!1,e,r),o=i.firstChild,1===i.childNodes.length&&(i=o),o||r)){for(u=(s=w.map(ye(i,"script"),He)).length;f")},clone:function(e,t,n){var r,i,o,a,s=e.cloneNode(!0),u=w.contains(e.ownerDocument,e);if(!(h.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||w.isXMLDoc(e)))for(a=ye(s),r=0,i=(o=ye(e)).length;r0&&ve(a,!u&&ye(e,"script")),s},cleanData:function(e){for(var t,n,r,i=w.event.special,o=0;void 0!==(n=e[o]);o++)if(Y(n)){if(t=n[J.expando]){if(t.events)for(r in t.events)i[r]?w.event.remove(n,r):w.removeEvent(n,r,t.handle);n[J.expando]=void 0}n[K.expando]&&(n[K.expando]=void 0)}}}),w.fn.extend({detach:function(e){return Ie(this,e,!0)},remove:function(e){return Ie(this,e)},text:function(e){return z(this,function(e){return void 0===e?w.text(this):this.empty().each(function(){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||(this.textContent=e)})},null,e,arguments.length)},append:function(){return Re(this,arguments,function(e){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||Le(this,e).appendChild(e)})},prepend:function(){return Re(this,arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=Le(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return Re(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return Re(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},empty:function(){for(var e,t=0;null!=(e=this[t]);t++)1===e.nodeType&&(w.cleanData(ye(e,!1)),e.textContent="");return this},clone:function(e,t){return e=null!=e&&e,t=null==t?e:t,this.map(function(){return w.clone(this,e,t)})},html:function(e){return z(this,function(e){var t=this[0]||{},n=0,r=this.length;if(void 0===e&&1===t.nodeType)return t.innerHTML;if("string"==typeof e&&!Ae.test(e)&&!ge[(de.exec(e)||["",""])[1].toLowerCase()]){e=w.htmlPrefilter(e);try{for(;n=0&&(u+=Math.max(0,Math.ceil(e["offset"+t[0].toUpperCase()+t.slice(1)]-o-u-s-.5))),u}function et(e,t,n){var r=$e(e),i=Fe(e,t,r),o="border-box"===w.css(e,"boxSizing",!1,r),a=o;if(We.test(i)){if(!n)return i;i="auto"}return a=a&&(h.boxSizingReliable()||i===e.style[t]),("auto"===i||!parseFloat(i)&&"inline"===w.css(e,"display",!1,r))&&(i=e["offset"+t[0].toUpperCase()+t.slice(1)],a=!0),(i=parseFloat(i)||0)+Ze(e,t,n||(o?"border":"content"),a,r,i)+"px"}w.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Fe(e,"opacity");return""===n?"1":n}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{},style:function(e,t,n,r){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var i,o,a,s=G(t),u=Xe.test(t),l=e.style;if(u||(t=Je(s)),a=w.cssHooks[t]||w.cssHooks[s],void 0===n)return a&&"get"in a&&void 0!==(i=a.get(e,!1,r))?i:l[t];"string"==(o=typeof n)&&(i=ie.exec(n))&&i[1]&&(n=ue(e,t,i),o="number"),null!=n&&n===n&&("number"===o&&(n+=i&&i[3]||(w.cssNumber[s]?"":"px")),h.clearCloneStyle||""!==n||0!==t.indexOf("background")||(l[t]="inherit"),a&&"set"in a&&void 0===(n=a.set(e,n,r))||(u?l.setProperty(t,n):l[t]=n))}},css:function(e,t,n,r){var i,o,a,s=G(t);return Xe.test(t)||(t=Je(s)),(a=w.cssHooks[t]||w.cssHooks[s])&&"get"in a&&(i=a.get(e,!0,n)),void 0===i&&(i=Fe(e,t,r)),"normal"===i&&t in Ve&&(i=Ve[t]),""===n||n?(o=parseFloat(i),!0===n||isFinite(o)?o||0:i):i}}),w.each(["height","width"],function(e,t){w.cssHooks[t]={get:function(e,n,r){if(n)return!ze.test(w.css(e,"display"))||e.getClientRects().length&&e.getBoundingClientRect().width?et(e,t,r):se(e,Ue,function(){return et(e,t,r)})},set:function(e,n,r){var i,o=$e(e),a="border-box"===w.css(e,"boxSizing",!1,o),s=r&&Ze(e,t,r,a,o);return a&&h.scrollboxSize()===o.position&&(s-=Math.ceil(e["offset"+t[0].toUpperCase()+t.slice(1)]-parseFloat(o[t])-Ze(e,t,"border",!1,o)-.5)),s&&(i=ie.exec(n))&&"px"!==(i[3]||"px")&&(e.style[t]=n,n=w.css(e,t)),Ke(e,n,s)}}}),w.cssHooks.marginLeft=_e(h.reliableMarginLeft,function(e,t){if(t)return(parseFloat(Fe(e,"marginLeft"))||e.getBoundingClientRect().left-se(e,{marginLeft:0},function(){return e.getBoundingClientRect().left}))+"px"}),w.each({margin:"",padding:"",border:"Width"},function(e,t){w.cssHooks[e+t]={expand:function(n){for(var r=0,i={},o="string"==typeof n?n.split(" "):[n];r<4;r++)i[e+oe[r]+t]=o[r]||o[r-2]||o[0];return i}},"margin"!==e&&(w.cssHooks[e+t].set=Ke)}),w.fn.extend({css:function(e,t){return z(this,function(e,t,n){var r,i,o={},a=0;if(Array.isArray(t)){for(r=$e(e),i=t.length;a1)}});function tt(e,t,n,r,i){return new tt.prototype.init(e,t,n,r,i)}w.Tween=tt,tt.prototype={constructor:tt,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||w.easing._default,this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(w.cssNumber[n]?"":"px")},cur:function(){var e=tt.propHooks[this.prop];return e&&e.get?e.get(this):tt.propHooks._default.get(this)},run:function(e){var t,n=tt.propHooks[this.prop];return this.options.duration?this.pos=t=w.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):this.pos=t=e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):tt.propHooks._default.set(this),this}},tt.prototype.init.prototype=tt.prototype,tt.propHooks={_default:{get:function(e){var t;return 1!==e.elem.nodeType||null!=e.elem[e.prop]&&null==e.elem.style[e.prop]?e.elem[e.prop]:(t=w.css(e.elem,e.prop,""))&&"auto"!==t?t:0},set:function(e){w.fx.step[e.prop]?w.fx.step[e.prop](e):1!==e.elem.nodeType||null==e.elem.style[w.cssProps[e.prop]]&&!w.cssHooks[e.prop]?e.elem[e.prop]=e.now:w.style(e.elem,e.prop,e.now+e.unit)}}},tt.propHooks.scrollTop=tt.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},w.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2},_default:"swing"},w.fx=tt.prototype.init,w.fx.step={};var nt,rt,it=/^(?:toggle|show|hide)$/,ot=/queueHooks$/;function at(){rt&&(!1===r.hidden&&e.requestAnimationFrame?e.requestAnimationFrame(at):e.setTimeout(at,w.fx.interval),w.fx.tick())}function st(){return e.setTimeout(function(){nt=void 0}),nt=Date.now()}function ut(e,t){var n,r=0,i={height:e};for(t=t?1:0;r<4;r+=2-t)i["margin"+(n=oe[r])]=i["padding"+n]=e;return t&&(i.opacity=i.width=e),i}function lt(e,t,n){for(var r,i=(pt.tweeners[t]||[]).concat(pt.tweeners["*"]),o=0,a=i.length;o1)},removeAttr:function(e){return this.each(function(){w.removeAttr(this,e)})}}),w.extend({attr:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return"undefined"==typeof e.getAttribute?w.prop(e,t,n):(1===o&&w.isXMLDoc(e)||(i=w.attrHooks[t.toLowerCase()]||(w.expr.match.bool.test(t)?dt:void 0)),void 0!==n?null===n?void w.removeAttr(e,t):i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:(e.setAttribute(t,n+""),n):i&&"get"in i&&null!==(r=i.get(e,t))?r:null==(r=w.find.attr(e,t))?void 0:r)},attrHooks:{type:{set:function(e,t){if(!h.radioValue&&"radio"===t&&N(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},removeAttr:function(e,t){var n,r=0,i=t&&t.match(M);if(i&&1===e.nodeType)while(n=i[r++])e.removeAttribute(n)}}),dt={set:function(e,t,n){return!1===t?w.removeAttr(e,n):e.setAttribute(n,n),n}},w.each(w.expr.match.bool.source.match(/\w+/g),function(e,t){var n=ht[t]||w.find.attr;ht[t]=function(e,t,r){var i,o,a=t.toLowerCase();return r||(o=ht[a],ht[a]=i,i=null!=n(e,t,r)?a:null,ht[a]=o),i}});var gt=/^(?:input|select|textarea|button)$/i,yt=/^(?:a|area)$/i;w.fn.extend({prop:function(e,t){return z(this,w.prop,e,t,arguments.length>1)},removeProp:function(e){return this.each(function(){delete this[w.propFix[e]||e]})}}),w.extend({prop:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return 1===o&&w.isXMLDoc(e)||(t=w.propFix[t]||t,i=w.propHooks[t]),void 0!==n?i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:e[t]=n:i&&"get"in i&&null!==(r=i.get(e,t))?r:e[t]},propHooks:{tabIndex:{get:function(e){var t=w.find.attr(e,"tabindex");return t?parseInt(t,10):gt.test(e.nodeName)||yt.test(e.nodeName)&&e.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),h.optSelected||(w.propHooks.selected={get:function(e){var t=e.parentNode;return t&&t.parentNode&&t.parentNode.selectedIndex,null},set:function(e){var t=e.parentNode;t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex)}}),w.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){w.propFix[this.toLowerCase()]=this});function vt(e){return(e.match(M)||[]).join(" ")}function mt(e){return e.getAttribute&&e.getAttribute("class")||""}function xt(e){return Array.isArray(e)?e:"string"==typeof e?e.match(M)||[]:[]}w.fn.extend({addClass:function(e){var t,n,r,i,o,a,s,u=0;if(g(e))return this.each(function(t){w(this).addClass(e.call(this,t,mt(this)))});if((t=xt(e)).length)while(n=this[u++])if(i=mt(n),r=1===n.nodeType&&" "+vt(i)+" "){a=0;while(o=t[a++])r.indexOf(" "+o+" ")<0&&(r+=o+" ");i!==(s=vt(r))&&n.setAttribute("class",s)}return this},removeClass:function(e){var t,n,r,i,o,a,s,u=0;if(g(e))return this.each(function(t){w(this).removeClass(e.call(this,t,mt(this)))});if(!arguments.length)return this.attr("class","");if((t=xt(e)).length)while(n=this[u++])if(i=mt(n),r=1===n.nodeType&&" "+vt(i)+" "){a=0;while(o=t[a++])while(r.indexOf(" "+o+" ")>-1)r=r.replace(" "+o+" "," ");i!==(s=vt(r))&&n.setAttribute("class",s)}return this},toggleClass:function(e,t){var n=typeof e,r="string"===n||Array.isArray(e);return"boolean"==typeof t&&r?t?this.addClass(e):this.removeClass(e):g(e)?this.each(function(n){w(this).toggleClass(e.call(this,n,mt(this),t),t)}):this.each(function(){var t,i,o,a;if(r){i=0,o=w(this),a=xt(e);while(t=a[i++])o.hasClass(t)?o.removeClass(t):o.addClass(t)}else void 0!==e&&"boolean"!==n||((t=mt(this))&&J.set(this,"__className__",t),this.setAttribute&&this.setAttribute("class",t||!1===e?"":J.get(this,"__className__")||""))})},hasClass:function(e){var t,n,r=0;t=" "+e+" ";while(n=this[r++])if(1===n.nodeType&&(" "+vt(mt(n))+" ").indexOf(t)>-1)return!0;return!1}});var bt=/\r/g;w.fn.extend({val:function(e){var t,n,r,i=this[0];{if(arguments.length)return r=g(e),this.each(function(n){var i;1===this.nodeType&&(null==(i=r?e.call(this,n,w(this).val()):e)?i="":"number"==typeof i?i+="":Array.isArray(i)&&(i=w.map(i,function(e){return null==e?"":e+""})),(t=w.valHooks[this.type]||w.valHooks[this.nodeName.toLowerCase()])&&"set"in t&&void 0!==t.set(this,i,"value")||(this.value=i))});if(i)return(t=w.valHooks[i.type]||w.valHooks[i.nodeName.toLowerCase()])&&"get"in t&&void 0!==(n=t.get(i,"value"))?n:"string"==typeof(n=i.value)?n.replace(bt,""):null==n?"":n}}}),w.extend({valHooks:{option:{get:function(e){var t=w.find.attr(e,"value");return null!=t?t:vt(w.text(e))}},select:{get:function(e){var t,n,r,i=e.options,o=e.selectedIndex,a="select-one"===e.type,s=a?null:[],u=a?o+1:i.length;for(r=o<0?u:a?o:0;r-1)&&(n=!0);return n||(e.selectedIndex=-1),o}}}}),w.each(["radio","checkbox"],function(){w.valHooks[this]={set:function(e,t){if(Array.isArray(t))return e.checked=w.inArray(w(e).val(),t)>-1}},h.checkOn||(w.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})}),h.focusin="onfocusin"in e;var wt=/^(?:focusinfocus|focusoutblur)$/,Tt=function(e){e.stopPropagation()};w.extend(w.event,{trigger:function(t,n,i,o){var a,s,u,l,c,p,d,h,v=[i||r],m=f.call(t,"type")?t.type:t,x=f.call(t,"namespace")?t.namespace.split("."):[];if(s=h=u=i=i||r,3!==i.nodeType&&8!==i.nodeType&&!wt.test(m+w.event.triggered)&&(m.indexOf(".")>-1&&(m=(x=m.split(".")).shift(),x.sort()),c=m.indexOf(":")<0&&"on"+m,t=t[w.expando]?t:new w.Event(m,"object"==typeof t&&t),t.isTrigger=o?2:3,t.namespace=x.join("."),t.rnamespace=t.namespace?new RegExp("(^|\\.)"+x.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,t.result=void 0,t.target||(t.target=i),n=null==n?[t]:w.makeArray(n,[t]),d=w.event.special[m]||{},o||!d.trigger||!1!==d.trigger.apply(i,n))){if(!o&&!d.noBubble&&!y(i)){for(l=d.delegateType||m,wt.test(l+m)||(s=s.parentNode);s;s=s.parentNode)v.push(s),u=s;u===(i.ownerDocument||r)&&v.push(u.defaultView||u.parentWindow||e)}a=0;while((s=v[a++])&&!t.isPropagationStopped())h=s,t.type=a>1?l:d.bindType||m,(p=(J.get(s,"events")||{})[t.type]&&J.get(s,"handle"))&&p.apply(s,n),(p=c&&s[c])&&p.apply&&Y(s)&&(t.result=p.apply(s,n),!1===t.result&&t.preventDefault());return t.type=m,o||t.isDefaultPrevented()||d._default&&!1!==d._default.apply(v.pop(),n)||!Y(i)||c&&g(i[m])&&!y(i)&&((u=i[c])&&(i[c]=null),w.event.triggered=m,t.isPropagationStopped()&&h.addEventListener(m,Tt),i[m](),t.isPropagationStopped()&&h.removeEventListener(m,Tt),w.event.triggered=void 0,u&&(i[c]=u)),t.result}},simulate:function(e,t,n){var r=w.extend(new w.Event,n,{type:e,isSimulated:!0});w.event.trigger(r,null,t)}}),w.fn.extend({trigger:function(e,t){return this.each(function(){w.event.trigger(e,t,this)})},triggerHandler:function(e,t){var n=this[0];if(n)return w.event.trigger(e,t,n,!0)}}),h.focusin||w.each({focus:"focusin",blur:"focusout"},function(e,t){var n=function(e){w.event.simulate(t,e.target,w.event.fix(e))};w.event.special[t]={setup:function(){var r=this.ownerDocument||this,i=J.access(r,t);i||r.addEventListener(e,n,!0),J.access(r,t,(i||0)+1)},teardown:function(){var r=this.ownerDocument||this,i=J.access(r,t)-1;i?J.access(r,t,i):(r.removeEventListener(e,n,!0),J.remove(r,t))}}});var Ct=e.location,Et=Date.now(),kt=/\?/;w.parseXML=function(t){var n;if(!t||"string"!=typeof t)return null;try{n=(new e.DOMParser).parseFromString(t,"text/xml")}catch(e){n=void 0}return n&&!n.getElementsByTagName("parsererror").length||w.error("Invalid XML: "+t),n};var St=/\[\]$/,Dt=/\r?\n/g,Nt=/^(?:submit|button|image|reset|file)$/i,At=/^(?:input|select|textarea|keygen)/i;function jt(e,t,n,r){var i;if(Array.isArray(t))w.each(t,function(t,i){n||St.test(e)?r(e,i):jt(e+"["+("object"==typeof i&&null!=i?t:"")+"]",i,n,r)});else if(n||"object"!==x(t))r(e,t);else for(i in t)jt(e+"["+i+"]",t[i],n,r)}w.param=function(e,t){var n,r=[],i=function(e,t){var n=g(t)?t():t;r[r.length]=encodeURIComponent(e)+"="+encodeURIComponent(null==n?"":n)};if(Array.isArray(e)||e.jquery&&!w.isPlainObject(e))w.each(e,function(){i(this.name,this.value)});else for(n in e)jt(n,e[n],t,i);return r.join("&")},w.fn.extend({serialize:function(){return w.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=w.prop(this,"elements");return e?w.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!w(this).is(":disabled")&&At.test(this.nodeName)&&!Nt.test(e)&&(this.checked||!pe.test(e))}).map(function(e,t){var n=w(this).val();return null==n?null:Array.isArray(n)?w.map(n,function(e){return{name:t.name,value:e.replace(Dt,"\r\n")}}):{name:t.name,value:n.replace(Dt,"\r\n")}}).get()}});var qt=/%20/g,Lt=/#.*$/,Ht=/([?&])_=[^&]*/,Ot=/^(.*?):[ \t]*([^\r\n]*)$/gm,Pt=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Mt=/^(?:GET|HEAD)$/,Rt=/^\/\//,It={},Wt={},$t="*/".concat("*"),Bt=r.createElement("a");Bt.href=Ct.href;function Ft(e){return function(t,n){"string"!=typeof t&&(n=t,t="*");var r,i=0,o=t.toLowerCase().match(M)||[];if(g(n))while(r=o[i++])"+"===r[0]?(r=r.slice(1)||"*",(e[r]=e[r]||[]).unshift(n)):(e[r]=e[r]||[]).push(n)}}function _t(e,t,n,r){var i={},o=e===Wt;function a(s){var u;return i[s]=!0,w.each(e[s]||[],function(e,s){var l=s(t,n,r);return"string"!=typeof l||o||i[l]?o?!(u=l):void 0:(t.dataTypes.unshift(l),a(l),!1)}),u}return a(t.dataTypes[0])||!i["*"]&&a("*")}function zt(e,t){var n,r,i=w.ajaxSettings.flatOptions||{};for(n in t)void 0!==t[n]&&((i[n]?e:r||(r={}))[n]=t[n]);return r&&w.extend(!0,e,r),e}function Xt(e,t,n){var r,i,o,a,s=e.contents,u=e.dataTypes;while("*"===u[0])u.shift(),void 0===r&&(r=e.mimeType||t.getResponseHeader("Content-Type"));if(r)for(i in s)if(s[i]&&s[i].test(r)){u.unshift(i);break}if(u[0]in n)o=u[0];else{for(i in n){if(!u[0]||e.converters[i+" "+u[0]]){o=i;break}a||(a=i)}o=o||a}if(o)return o!==u[0]&&u.unshift(o),n[o]}function Ut(e,t,n,r){var i,o,a,s,u,l={},c=e.dataTypes.slice();if(c[1])for(a in e.converters)l[a.toLowerCase()]=e.converters[a];o=c.shift();while(o)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!u&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u=o,o=c.shift())if("*"===o)o=u;else if("*"!==u&&u!==o){if(!(a=l[u+" "+o]||l["* "+o]))for(i in l)if((s=i.split(" "))[1]===o&&(a=l[u+" "+s[0]]||l["* "+s[0]])){!0===a?a=l[i]:!0!==l[i]&&(o=s[0],c.unshift(s[1]));break}if(!0!==a)if(a&&e["throws"])t=a(t);else try{t=a(t)}catch(e){return{state:"parsererror",error:a?e:"No conversion from "+u+" to "+o}}}return{state:"success",data:t}}w.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:Ct.href,type:"GET",isLocal:Pt.test(Ct.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":$t,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":JSON.parse,"text xml":w.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?zt(zt(e,w.ajaxSettings),t):zt(w.ajaxSettings,e)},ajaxPrefilter:Ft(It),ajaxTransport:Ft(Wt),ajax:function(t,n){"object"==typeof t&&(n=t,t=void 0),n=n||{};var i,o,a,s,u,l,c,f,p,d,h=w.ajaxSetup({},n),g=h.context||h,y=h.context&&(g.nodeType||g.jquery)?w(g):w.event,v=w.Deferred(),m=w.Callbacks("once memory"),x=h.statusCode||{},b={},T={},C="canceled",E={readyState:0,getResponseHeader:function(e){var t;if(c){if(!s){s={};while(t=Ot.exec(a))s[t[1].toLowerCase()]=t[2]}t=s[e.toLowerCase()]}return null==t?null:t},getAllResponseHeaders:function(){return c?a:null},setRequestHeader:function(e,t){return null==c&&(e=T[e.toLowerCase()]=T[e.toLowerCase()]||e,b[e]=t),this},overrideMimeType:function(e){return null==c&&(h.mimeType=e),this},statusCode:function(e){var t;if(e)if(c)E.always(e[E.status]);else for(t in e)x[t]=[x[t],e[t]];return this},abort:function(e){var t=e||C;return i&&i.abort(t),k(0,t),this}};if(v.promise(E),h.url=((t||h.url||Ct.href)+"").replace(Rt,Ct.protocol+"//"),h.type=n.method||n.type||h.method||h.type,h.dataTypes=(h.dataType||"*").toLowerCase().match(M)||[""],null==h.crossDomain){l=r.createElement("a");try{l.href=h.url,l.href=l.href,h.crossDomain=Bt.protocol+"//"+Bt.host!=l.protocol+"//"+l.host}catch(e){h.crossDomain=!0}}if(h.data&&h.processData&&"string"!=typeof h.data&&(h.data=w.param(h.data,h.traditional)),_t(It,h,n,E),c)return E;(f=w.event&&h.global)&&0==w.active++&&w.event.trigger("ajaxStart"),h.type=h.type.toUpperCase(),h.hasContent=!Mt.test(h.type),o=h.url.replace(Lt,""),h.hasContent?h.data&&h.processData&&0===(h.contentType||"").indexOf("application/x-www-form-urlencoded")&&(h.data=h.data.replace(qt,"+")):(d=h.url.slice(o.length),h.data&&(h.processData||"string"==typeof h.data)&&(o+=(kt.test(o)?"&":"?")+h.data,delete h.data),!1===h.cache&&(o=o.replace(Ht,"$1"),d=(kt.test(o)?"&":"?")+"_="+Et+++d),h.url=o+d),h.ifModified&&(w.lastModified[o]&&E.setRequestHeader("If-Modified-Since",w.lastModified[o]),w.etag[o]&&E.setRequestHeader("If-None-Match",w.etag[o])),(h.data&&h.hasContent&&!1!==h.contentType||n.contentType)&&E.setRequestHeader("Content-Type",h.contentType),E.setRequestHeader("Accept",h.dataTypes[0]&&h.accepts[h.dataTypes[0]]?h.accepts[h.dataTypes[0]]+("*"!==h.dataTypes[0]?", "+$t+"; q=0.01":""):h.accepts["*"]);for(p in h.headers)E.setRequestHeader(p,h.headers[p]);if(h.beforeSend&&(!1===h.beforeSend.call(g,E,h)||c))return E.abort();if(C="abort",m.add(h.complete),E.done(h.success),E.fail(h.error),i=_t(Wt,h,n,E)){if(E.readyState=1,f&&y.trigger("ajaxSend",[E,h]),c)return E;h.async&&h.timeout>0&&(u=e.setTimeout(function(){E.abort("timeout")},h.timeout));try{c=!1,i.send(b,k)}catch(e){if(c)throw e;k(-1,e)}}else k(-1,"No Transport");function k(t,n,r,s){var l,p,d,b,T,C=n;c||(c=!0,u&&e.clearTimeout(u),i=void 0,a=s||"",E.readyState=t>0?4:0,l=t>=200&&t<300||304===t,r&&(b=Xt(h,E,r)),b=Ut(h,b,E,l),l?(h.ifModified&&((T=E.getResponseHeader("Last-Modified"))&&(w.lastModified[o]=T),(T=E.getResponseHeader("etag"))&&(w.etag[o]=T)),204===t||"HEAD"===h.type?C="nocontent":304===t?C="notmodified":(C=b.state,p=b.data,l=!(d=b.error))):(d=C,!t&&C||(C="error",t<0&&(t=0))),E.status=t,E.statusText=(n||C)+"",l?v.resolveWith(g,[p,C,E]):v.rejectWith(g,[E,C,d]),E.statusCode(x),x=void 0,f&&y.trigger(l?"ajaxSuccess":"ajaxError",[E,h,l?p:d]),m.fireWith(g,[E,C]),f&&(y.trigger("ajaxComplete",[E,h]),--w.active||w.event.trigger("ajaxStop")))}return E},getJSON:function(e,t,n){return w.get(e,t,n,"json")},getScript:function(e,t){return w.get(e,void 0,t,"script")}}),w.each(["get","post"],function(e,t){w[t]=function(e,n,r,i){return g(n)&&(i=i||r,r=n,n=void 0),w.ajax(w.extend({url:e,type:t,dataType:i,data:n,success:r},w.isPlainObject(e)&&e))}}),w._evalUrl=function(e){return w.ajax({url:e,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,"throws":!0})},w.fn.extend({wrapAll:function(e){var t;return this[0]&&(g(e)&&(e=e.call(this[0])),t=w(e,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstElementChild)e=e.firstElementChild;return e}).append(this)),this},wrapInner:function(e){return g(e)?this.each(function(t){w(this).wrapInner(e.call(this,t))}):this.each(function(){var t=w(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=g(e);return this.each(function(n){w(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(e){return this.parent(e).not("body").each(function(){w(this).replaceWith(this.childNodes)}),this}}),w.expr.pseudos.hidden=function(e){return!w.expr.pseudos.visible(e)},w.expr.pseudos.visible=function(e){return!!(e.offsetWidth||e.offsetHeight||e.getClientRects().length)},w.ajaxSettings.xhr=function(){try{return new e.XMLHttpRequest}catch(e){}};var Vt={0:200,1223:204},Gt=w.ajaxSettings.xhr();h.cors=!!Gt&&"withCredentials"in Gt,h.ajax=Gt=!!Gt,w.ajaxTransport(function(t){var n,r;if(h.cors||Gt&&!t.crossDomain)return{send:function(i,o){var a,s=t.xhr();if(s.open(t.type,t.url,t.async,t.username,t.password),t.xhrFields)for(a in t.xhrFields)s[a]=t.xhrFields[a];t.mimeType&&s.overrideMimeType&&s.overrideMimeType(t.mimeType),t.crossDomain||i["X-Requested-With"]||(i["X-Requested-With"]="XMLHttpRequest");for(a in i)s.setRequestHeader(a,i[a]);n=function(e){return function(){n&&(n=r=s.onload=s.onerror=s.onabort=s.ontimeout=s.onreadystatechange=null,"abort"===e?s.abort():"error"===e?"number"!=typeof s.status?o(0,"error"):o(s.status,s.statusText):o(Vt[s.status]||s.status,s.statusText,"text"!==(s.responseType||"text")||"string"!=typeof s.responseText?{binary:s.response}:{text:s.responseText},s.getAllResponseHeaders()))}},s.onload=n(),r=s.onerror=s.ontimeout=n("error"),void 0!==s.onabort?s.onabort=r:s.onreadystatechange=function(){4===s.readyState&&e.setTimeout(function(){n&&r()})},n=n("abort");try{s.send(t.hasContent&&t.data||null)}catch(e){if(n)throw e}},abort:function(){n&&n()}}}),w.ajaxPrefilter(function(e){e.crossDomain&&(e.contents.script=!1)}),w.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(e){return w.globalEval(e),e}}}),w.ajaxPrefilter("script",function(e){void 0===e.cache&&(e.cache=!1),e.crossDomain&&(e.type="GET")}),w.ajaxTransport("script",function(e){if(e.crossDomain){var t,n;return{send:function(i,o){t=w(" @@ -57,14 +57,24 @@ file that was distributed with this source code.
    +
  • +
    +
    {{ 'admin.content.block_name'|trans }}
    +
    {{ 'admin.content.block_file_name'|trans }}
    +
    +
    +
    • {% for Block in Blocks %}
  • -
    +
    {{ Block.name }}
    +
    + {{ Block.file_name }}.twig +
    diff --git a/src/Eccube/Resource/template/admin/Content/block_edit.twig b/src/Eccube/Resource/template/admin/Content/block_edit.twig index d42d6e03f87..59e24cb0914 100644 --- a/src/Eccube/Resource/template/admin/Content/block_edit.twig +++ b/src/Eccube/Resource/template/admin/Content/block_edit.twig @@ -125,7 +125,7 @@ file that was distributed with this source code.
    {# エンティティ拡張の自動出力 #} - {% for f in form if f.vars.eccube_form_options.auto_render %} + {% for f in form|filter(f => f.vars.eccube_form_options.auto_render) %} {% if f.vars.eccube_form_options.form_theme %} {% form_theme f f.vars.eccube_form_options.form_theme %} {{ form_row(f) }} diff --git a/src/Eccube/Resource/template/admin/Content/layout.twig b/src/Eccube/Resource/template/admin/Content/layout.twig index b191825562b..c716dfb8976 100644 --- a/src/Eccube/Resource/template/admin/Content/layout.twig +++ b/src/Eccube/Resource/template/admin/Content/layout.twig @@ -223,7 +223,7 @@ file that was distributed with this source code.
    {# エンティティ拡張の自動出力 #} - {% for f in form if f.vars.eccube_form_options.auto_render %} + {% for f in form|filter(f => f.vars.eccube_form_options.auto_render) %} {% if f.vars.eccube_form_options.form_theme %} {% form_theme f f.vars.eccube_form_options.form_theme %} {{ form_row(f) }} diff --git a/src/Eccube/Resource/template/admin/Content/news_edit.twig b/src/Eccube/Resource/template/admin/Content/news_edit.twig index 702a0622689..e518ef3c07f 100644 --- a/src/Eccube/Resource/template/admin/Content/news_edit.twig +++ b/src/Eccube/Resource/template/admin/Content/news_edit.twig @@ -85,7 +85,7 @@ file that was distributed with this source code.
    {# エンティティ拡張の自動出力 #} - {% for f in form if f.vars.eccube_form_options.auto_render %} + {% for f in form|filter(f => f.vars.eccube_form_options.auto_render) %} {% if f.vars.eccube_form_options.form_theme %} {% form_theme f f.vars.eccube_form_options.form_theme %} {{ form_row(f) }} diff --git a/src/Eccube/Resource/template/admin/Content/page.twig b/src/Eccube/Resource/template/admin/Content/page.twig index 3473f356f97..da40127f0f7 100644 --- a/src/Eccube/Resource/template/admin/Content/page.twig +++ b/src/Eccube/Resource/template/admin/Content/page.twig @@ -16,12 +16,12 @@ file that was distributed with this source code. {% block sub_title %}{{ 'admin.content.contents_management'|trans }}{% endblock %} {% block javascript %} - + {% endblock javascript %} {% block main %} @@ -52,6 +52,9 @@ file that was distributed with this source code. + + + @@ -60,8 +63,21 @@ file that was distributed with this source code. + + + {# TODO レイアウトの数にかかわらず高さを揃えたい #} - - +
    {{ 'admin.content.page_name'|trans }}{{ 'admin.content.page_route_name'|trans }}{{ 'admin.content.page_url'|trans }}{{ 'admin.content.page_file_name'|trans }} {{ 'admin.content.layout_name'|trans }}
    {{ Page.name }} + {{ Page.url }} + + {% if router.routecollection.get(Page.url) %} + {{ router.routecollection.get(Page.url).path }} + {% else %} + {{ Page.url }} + {% endif %} + + {% if Page.file_name %}{{ Page.file_name }}.twig{% endif %} + + {% for Layout in Page.layouts %} {% if Layout.device_type.id == constant('Eccube\\Entity\\Master\\DeviceType::DEVICE_TYPE_PC') %} {% set icon = 'fa-desktop' %} @@ -83,7 +99,7 @@ file that was distributed with this source code. {# エンティティ拡張の自動出力 #} - {% for f in form if f.vars.eccube_form_options.auto_render %} + {% for f in form|filter(f => f.vars.eccube_form_options.auto_render) %} {% if f.vars.eccube_form_options.form_theme %} {% form_theme f f.vars.eccube_form_options.form_theme %} {{ form_row(f) }} @@ -173,114 +173,116 @@ file that was distributed with this source code. - -
    -
    -
    -
    -
    - - {{ 'admin.content.page_layout__card_title'|trans }} - - + {%- if not is_confirm_page %} + +
    +
    +
    +
    +
    + + {{ 'admin.content.page_layout__card_title'|trans }} + + +
    +
    +
    +
    -
    -
    -
    -
    -
    -
    - -
    -
    {{ 'admin.content.page_pc'|trans }}
    -
    - {{ form_widget(form.PcLayout) }} - {{ form_errors(form.PcLayout) }} +
    +
    + +
    +
    {{ 'admin.content.page_pc'|trans }}
    +
    + {{ form_widget(form.PcLayout) }} + {{ form_errors(form.PcLayout) }} +
    -
    - -
    -
    {{ 'admin.content.page_mobile'|trans }}
    -
    - {{ form_widget(form.SpLayout) }} - {{ form_errors(form.SpLayout) }} + +
    +
    {{ 'admin.content.page_mobile'|trans }}
    +
    + {{ form_widget(form.SpLayout) }} + {{ form_errors(form.SpLayout) }} +
    -
    - -
    -
    -
    -
    -
    - {{ 'admin.content.page_meta__card_title'|trans }} - + +
    +
    +
    +
    +
    + {{ 'admin.content.page_meta__card_title'|trans }} + +
    -
    -
    - -
    -
    -
    -
    -
    - -
    -
    {{ 'admin.content.page_meta_author'|trans }}
    -
    - {{ form_widget(form.author) }} - {{ form_errors(form.author) }} +
    +
    - -
    -
    {{ 'admin.content.page_meta_description'|trans }}
    -
    - {{ form_widget(form.description) }} - {{ form_errors(form.description) }} +
    +
    +
    + +
    +
    {{ 'admin.content.page_meta_author'|trans }}
    +
    + {{ form_widget(form.author) }} + {{ form_errors(form.author) }} +
    -
    - -
    -
    {{ 'admin.content.page_meta_keyword'|trans }}
    -
    - {{ form_widget(form.keyword) }} - {{ form_errors(form.keyword) }} + +
    +
    {{ 'admin.content.page_meta_description'|trans }}
    +
    + {{ form_widget(form.description) }} + {{ form_errors(form.description) }} +
    -
    - -
    -
    {{ 'admin.content.page_meta_robot'|trans }}
    -
    - {{ form_widget(form.meta_robots) }} - {{ form_errors(form.meta_robots) }} + +
    +
    {{ 'admin.content.page_meta_keyword'|trans }}
    +
    + {{ form_widget(form.keyword) }} + {{ form_errors(form.keyword) }} +
    -
    - -
    -
    -
    - {{ 'admin.content.page_meta_metatag'|trans }} - + +
    +
    {{ 'admin.content.page_meta_robot'|trans }}
    +
    + {{ form_widget(form.meta_robots) }} + {{ form_errors(form.meta_robots) }}
    -
    - {{ form_widget(form.meta_tags, { attr : { placeholder : 'admin.content.page_meta_metatag_placeholder'|trans, rows : '10' }}) }} - {{ form_errors(form.meta_tags) }} + +
    +
    +
    + {{ 'admin.content.page_meta_metatag'|trans }} + +
    +
    +
    + {{ form_widget(form.meta_tags, { attr : { placeholder : 'admin.content.page_meta_metatag_placeholder'|trans, rows : '10' }}) }} + {{ form_errors(form.meta_tags) }} +
    -
    + {% endif -%}
    diff --git a/src/Eccube/Resource/template/admin/Customer/delivery_edit.twig b/src/Eccube/Resource/template/admin/Customer/delivery_edit.twig index 494ae039c4f..529515e13af 100644 --- a/src/Eccube/Resource/template/admin/Customer/delivery_edit.twig +++ b/src/Eccube/Resource/template/admin/Customer/delivery_edit.twig @@ -157,7 +157,7 @@ file that was distributed with this source code.
    {# エンティティ拡張の自動出力 #} - {% for f in form if f.vars.eccube_form_options.auto_render %} + {% for f in form|filter(f => f.vars.eccube_form_options.auto_render) %} {% if f.vars.eccube_form_options.form_theme %} {% form_theme f f.vars.eccube_form_options.form_theme %} {{ form_row(f) }} diff --git a/src/Eccube/Resource/template/admin/Customer/edit.twig b/src/Eccube/Resource/template/admin/Customer/edit.twig index d5cda78bad3..805d2768f56 100644 --- a/src/Eccube/Resource/template/admin/Customer/edit.twig +++ b/src/Eccube/Resource/template/admin/Customer/edit.twig @@ -232,7 +232,7 @@ file that was distributed with this source code.
    {# エンティティ拡張の自動出力 #} - {% for f in form if f.vars.eccube_form_options.auto_render %} + {% for f in form|filter(f => f.vars.eccube_form_options.auto_render) %} {% if f.vars.eccube_form_options.form_theme %} {% form_theme f f.vars.eccube_form_options.form_theme %} {{ form_row(f) }} diff --git a/src/Eccube/Resource/template/admin/Customer/index.twig b/src/Eccube/Resource/template/admin/Customer/index.twig index 325aa3db3ab..a2ea6012813 100644 --- a/src/Eccube/Resource/template/admin/Customer/index.twig +++ b/src/Eccube/Resource/template/admin/Customer/index.twig @@ -33,56 +33,54 @@ file that was distributed with this source code. {% endblock stylesheet %} {% block javascript %} + + + + + + + + + + + + + + + +{% endblock %} + +{% block main %} +
    +
    +
    +
    + {{ form_widget(form._token) }} +
    +
    +
    + {{ 'admin.setting.shop.order_status.order_status'|trans }} +
    +
    +
    + + + + + + + + + + + + {% for OrderStatus in form.OrderStatuses %} + + + + + + + + {% endfor %} + +
    + {{ 'admin.setting.shop.order_status.id'|trans }} + +
    + {{ 'admin.setting.shop.order_status.customer_order_status_name'|trans }} +
    +     		+ {{ 'admin.setting.shop.order_status.admin_order_status_name'|trans }} + +
    + {{ 'admin.setting.shop.order_status.color'|trans }} +
    +     		+
    + {{ 'admin.setting.shop.order_status.display_order_count'|trans }} +
    +
    + {{ OrderStatus.vars.data.id }} + + {{ form_widget(OrderStatus.customer_order_status_name) }} + {{ form_errors(OrderStatus.customer_order_status_name) }} + + {{ form_widget(OrderStatus.name) }} + {{ form_errors(OrderStatus.name) }} + +
    + {{ form_widget(OrderStatus.color) }} + + + +
    + {{ form_errors(OrderStatus.color) }} +     		+ {{ form_widget(OrderStatus.display_order_count) }} + {{ form_errors(OrderStatus.display_order_count) }} +
    +
    +
    + +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +{% endblock %} diff --git a/src/Eccube/Resource/template/admin/Setting/Shop/payment_edit.twig b/src/Eccube/Resource/template/admin/Setting/Shop/payment_edit.twig index af986e503f9..4eafa76b889 100644 --- a/src/Eccube/Resource/template/admin/Setting/Shop/payment_edit.twig +++ b/src/Eccube/Resource/template/admin/Setting/Shop/payment_edit.twig @@ -153,7 +153,11 @@ file that was distributed with this source code.
    -
    {{ 'admin.setting.shop.payment.terms_of_use'|trans }}
    +
    +
    + {{ 'admin.setting.shop.payment.terms_of_use'|trans }} +
    +
    @@ -196,7 +200,7 @@ file that was distributed with this source code.
    {# エンティティ拡張の自動出力 #} - {% for f in form if f.vars.eccube_form_options.auto_render %} + {% for f in form|filter(f => f.vars.eccube_form_options.auto_render) %} {% if f.vars.eccube_form_options.form_theme %} {% form_theme f f.vars.eccube_form_options.form_theme %} {{ form_row(f) }} diff --git a/src/Eccube/Resource/template/admin/Setting/Shop/shop_master.twig b/src/Eccube/Resource/template/admin/Setting/Shop/shop_master.twig index 7181e390248..afcce37be20 100644 --- a/src/Eccube/Resource/template/admin/Setting/Shop/shop_master.twig +++ b/src/Eccube/Resource/template/admin/Setting/Shop/shop_master.twig @@ -171,7 +171,7 @@ file that was distributed with this source code.
    {# エンティティ拡張の自動出力 #} - {% for f in form if f.vars.eccube_form_options.auto_render %} + {% for f in form|filter(f => f.vars.eccube_form_options.auto_render) %} {% if f.vars.eccube_form_options.form_theme %} {% form_theme f f.vars.eccube_form_options.form_theme %} {{ form_row(f) }} @@ -352,4 +352,4 @@ file that was distributed with this source code.
    -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/src/Eccube/Resource/template/admin/Setting/Shop/tax_rule.twig b/src/Eccube/Resource/template/admin/Setting/Shop/tax_rule.twig index 178fef358b8..6f4910a4d89 100644 --- a/src/Eccube/Resource/template/admin/Setting/Shop/tax_rule.twig +++ b/src/Eccube/Resource/template/admin/Setting/Shop/tax_rule.twig @@ -160,8 +160,8 @@ file that was distributed with this source code.
    - - + +
    		diff --git a/src/Eccube/Resource/template/admin/Setting/System/authority.twig b/src/Eccube/Resource/template/admin/Setting/System/authority.twig index c95cec8ea79..fb11a0d22af 100644 --- a/src/Eccube/Resource/template/admin/Setting/System/authority.twig +++ b/src/Eccube/Resource/template/admin/Setting/System/authority.twig @@ -62,7 +62,7 @@ file that was distributed with this source code.

    {{ 'admin.setting.system.authority.example'|trans|raw }}

    + data-prototype="{% apply escape %}{{ include('@admin/Setting/System/authority_prototype.twig', {'form': form.AuthorityRoles.vars.prototype}) }}{% endapply %}"> diff --git a/src/Eccube/Resource/template/admin/Setting/System/login_history.twig b/src/Eccube/Resource/template/admin/Setting/System/login_history.twig new file mode 100644 index 00000000000..79124d51b3f --- /dev/null +++ b/src/Eccube/Resource/template/admin/Setting/System/login_history.twig @@ -0,0 +1,239 @@ +{# +This file is part of EC-CUBE + +Copyright(c) EC-CUBE CO.,LTD. All Rights Reserved. + +http://www.ec-cube.co.jp/ + +For the full copyright and license information, please view the LICENSE +file that was distributed with this source code. +#} + +{% extends '@admin/default_frame.twig' %} + +{% set menus = ['setting', 'system', 'login_history'] %} + +{% block title %}{{ 'admin.setting.system.login_history'|trans }}{% endblock %} +{% block sub_title %}{{ 'admin.setting.system'|trans }}{% endblock %} + +{% form_theme searchForm '@admin/Form/bootstrap_4_horizontal_layout.html.twig' %} + +{% block stylesheet %} + + +{% endblock stylesheet %} + +{% block javascript %} + + + + + +{% endblock javascript %} + +{% block main %} + + {{ form_widget(searchForm._token) }} +
    +
    +
    +
    +
    + + {{ form_widget(searchForm.multi) }} + {{ form_errors(searchForm.multi) }} +
    + +
    +
    +
    +
    +
    +
    +
    + + {{ form_widget(searchForm.user_name) }} + {{ form_errors(searchForm.user_name) }} +
    +
    +
    +
    + + {{ form_widget(searchForm.client_ip) }} + {{ form_errors(searchForm.client_ip) }} +
    +
    +
    + +
    +
    +
    + +
    +
    + {{ form_widget(searchForm.create_datetime_start) }} + {{ form_errors(searchForm.create_datetime_start) }} +
    +
    {{ 'admin.common.separator__range'|trans }}
    +
    + {{ form_widget(searchForm.create_datetime_end) }} + {{ form_errors(searchForm.create_datetime_end) }} +
    +
    +
    +
    +
    +
    + + {{ form_widget(searchForm.Status, { 'label_attr': { 'class': 'checkbox-inline'}}) }} + {{ form_errors(searchForm.Status) }} +
    +
    +
    + + {# エンティティ拡張の自動出力 #} + {% for f in searchForm if f.vars.eccube_form_options.auto_render %} +
    + {% if f.vars.eccube_form_options.form_theme %} + {% form_theme f f.vars.eccube_form_options.form_theme %} + {{ form_row(f) }} + {% else %} +
    +
    + + {{ form_widget(f) }} + {{ form_errors(f) }} +
    +
    + {% endif %} +
    + {% endfor %} +
    +
    +
    + + {% if pagination %} + {{ 'admin.common.search_result'|trans({'%count%':pagination.totalItemCount}) }} + {% endif %} +
    +
    + {{ include('@admin/search_items.twig', { 'form': searchForm }, ignore_missing = true) }} +
    +
    +
    +
    + {% if pagination and pagination.totalItemCount %} +
    +
    + +
    + {#Dropdown page count#} +
    + +
    +
    +
    +
    +
    +
    +
    +
    +
    {{ 'admin.setting.system.authority.authority'|trans }}
    + + + + + + + + + + + {% for LoginHistory in pagination %} + + + + + + + + {% endfor %} + +
    {{ 'admin.common.id'|trans }}{{ 'admin.setting.system.login_history.user_name'|trans }}{{ 'admin.setting.system.login_history.client_ip'|trans }}{{ 'admin.setting.system.login_history.create_date'|trans }}{{ 'admin.setting.system.login_history.status'|trans }}
    + {{ LoginHistory.id }} + + {{ LoginHistory.user_name }} + + {{ LoginHistory.client_ip }} + + {{ LoginHistory.create_date|date_format('','Y/m/d H:i:s') }} + + + {{ LoginHistory.Status }} + +
    +
    + {% if pagination.totalItemCount > 0 %} + {% include "@admin/pager.twig" with { 'pages' : pagination.paginationData, 'routes' : 'admin_setting_system_login_history_page' } %} + {% endif %} +
    +
    + + {% elseif has_errors %} +
    +
    +
    {{ 'admin.common.search_invalid_condition'|trans }}
    +
    {{ 'admin.common.search_try_change_condition'|trans }}
    +
    +
    + {% else %} +
    +
    +
    {{ 'admin.common.search_no_result'|trans }}
    +
    {{ 'admin.common.search_try_change_condition'|trans }}
    +
    {{ 'admin.common.search_try_advanced_search'|trans }}
    +
    +
    + {% endif %} + + + + +{% endblock %} diff --git a/src/Eccube/Resource/template/admin/Setting/System/member_edit.twig b/src/Eccube/Resource/template/admin/Setting/System/member_edit.twig index bd13170cc02..f80836436e7 100644 --- a/src/Eccube/Resource/template/admin/Setting/System/member_edit.twig +++ b/src/Eccube/Resource/template/admin/Setting/System/member_edit.twig @@ -138,7 +138,7 @@ file that was distributed with this source code. {# エンティティ拡張の自動出力 #} - {% for f in form if f.vars.eccube_form_options.auto_render %} + {% for f in form|filter(f => f.vars.eccube_form_options.auto_render) %} {% if f.vars.eccube_form_options.form_theme %} {% form_theme f f.vars.eccube_form_options.form_theme %} {{ form_row(f) }} diff --git a/src/Eccube/Resource/template/admin/Setting/System/security.twig b/src/Eccube/Resource/template/admin/Setting/System/security.twig index c099a149ca8..bc8e9ba3b88 100644 --- a/src/Eccube/Resource/template/admin/Setting/System/security.twig +++ b/src/Eccube/Resource/template/admin/Setting/System/security.twig @@ -60,7 +60,7 @@ file that was distributed with this source code. {{ form_errors(form.admin_route_dir) }} - +
    @@ -73,6 +73,19 @@ file that was distributed with this source code.

    {{ 'admin.setting.system.security.ip_limit_description'|trans|nl2br }}

    + +
    +
    +
    + {{ 'admin.setting.system.security.ip_limit_deny'|trans }} +
    +
    +
    + {{ form_widget(form.admin_deny_hosts, { 'attr': { 'rows': '8', 'placeholder': 'admin.setting.system.security.ip_limit_sample'|trans }}) }} + {{ form_errors(form.admin_deny_hosts) }} +

    {{ 'admin.setting.system.security.ip_limit_description_deny'|trans|nl2br }}

    +
    +
    diff --git a/src/Eccube/Resource/template/admin/Store/plugin_table_official.twig b/src/Eccube/Resource/template/admin/Store/plugin_table_official.twig index e15ee228249..095f1a138be 100644 --- a/src/Eccube/Resource/template/admin/Store/plugin_table_official.twig +++ b/src/Eccube/Resource/template/admin/Store/plugin_table_official.twig @@ -68,7 +68,7 @@ $(function() { {{ Plugin.name }}
    		{{ Plugin.version }}{{ Plugin.version }}

    {{ Plugin.code }}

    		 {% if Plugin.id %} @@ -107,48 +107,46 @@ $(function() { {% if Plugin.id %} -
    -
    -
    - {% if Plugin.enabled == false %} - - - +
    +
    + {% if Plugin.enabled == false %} + + + - {% endif %} -
    -
    - {% if Plugin.enabled %} - - - - {% else %} - - - - {% endif %} -
    -
    - {% if configPages[Plugin.code] is defined %} - - - - {% endif %} -
    + {% endif %} +
    +
    + {% if Plugin.enabled %} + + + + {% else %} + + + + {% endif %} +
    +
    + {% if configPages[Plugin.code] is defined %} + + + + {% endif %}
    {% endif %} @@ -159,7 +157,7 @@ $(function() {
{% if officialPluginsDetail|length == 0 %} -

{{ 'admin.store.plugin.help'|trans }}

+

{{ 'admin.store.plugin.help'|trans }}

{% endif %} {% else %}
diff --git a/src/Eccube/Resource/template/admin/Store/template_add.twig b/src/Eccube/Resource/template/admin/Store/template_add.twig index 9fe46b226dd..d22775d1633 100644 --- a/src/Eccube/Resource/template/admin/Store/template_add.twig +++ b/src/Eccube/Resource/template/admin/Store/template_add.twig @@ -27,7 +27,13 @@ file that was distributed with this source code.
{{ 'admin.store.template.upload_new_template'|trans }}
-
{{ 'admin.store.template.template_code'|trans }}
+
+
+ {{ 'admin.store.template.template_code'|trans }} + +
+
{{ form_widget(form.code) }} {{ form_errors(form.code) }} @@ -35,7 +41,13 @@ file that was distributed with this source code.
-
{{ 'admin.store.template.template_name'|trans }}
+
+
+ {{ 'admin.store.template.template_name'|trans }} + +
+
{{ form_widget(form.name) }} {{ form_errors(form.name) }} @@ -43,7 +55,12 @@ file that was distributed with this source code.
-
{{ 'admin.store.template.template_file'|trans }} +
+
+ {{ 'admin.store.template.template_file'|trans }} + +

{{ 'admin.store.template.file_format'|trans }}
diff --git a/src/Eccube/Resource/template/admin/default_frame.twig b/src/Eccube/Resource/template/admin/default_frame.twig index 1d68e64dc98..b2d394b664c 100644 --- a/src/Eccube/Resource/template/admin/default_frame.twig +++ b/src/Eccube/Resource/template/admin/default_frame.twig @@ -23,7 +23,7 @@ file that was distributed with this source code. {% block stylesheet %}{% endblock %} - + + diff --git a/src/Eccube/Resource/template/admin/login_frame.twig b/src/Eccube/Resource/template/admin/login_frame.twig index 810c5b4c200..cc9c4be5b9e 100644 --- a/src/Eccube/Resource/template/admin/login_frame.twig +++ b/src/Eccube/Resource/template/admin/login_frame.twig @@ -19,7 +19,7 @@ file that was distributed with this source code. - +