Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Scan classes origin #13

Open
wants to merge 51 commits into
base: 9.2.x
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
a1ed057
Move core to replace rather than require to avoid package recursion.
lcatlett Nov 10, 2018
03ba819
Add autoloading by default and include repository config in root proj…
lcatlett Nov 10, 2018
34cbeaa
Remove unneeded scripts.
lcatlett Nov 10, 2018
37bbcd5
Move core to replace rather than require to avoid package recursion.
lcatlett Nov 10, 2018
cdf2939
Remove unneeded scripts.
lcatlett Nov 10, 2018
e915d8f
Add autoloading by default and include repository config in root proj…
lcatlett Nov 10, 2018
a49d59a
Merge branch 'scan-classes' of github.com:lcatlett/blt into scan-classes
lcatlett Nov 10, 2018
557e9e1
Only update to composer 1.7.2 due to 1.7.3 bug.
lcatlett Nov 10, 2018
e0d42c1
Account for require dev dependencies.
lcatlett Nov 10, 2018
d91f209
travis debug
lcatlett Nov 11, 2018
48abf3b
travis debug
lcatlett Nov 11, 2018
a9c2a93
Optimize autoloader.
lcatlett Nov 15, 2018
cdf2e02
Zend opcache settyings.
lcatlett Nov 15, 2018
6bb7e51
Debugging gitattributes.
lcatlett Nov 15, 2018
1e1c582
Update process timeout.
lcatlett Nov 15, 2018
e86bc93
Symlink changes.
lcatlett Nov 15, 2018
559dd5c
Replace changes.
lcatlett Nov 15, 2018
0f8d7f1
Replace changes.
lcatlett Nov 15, 2018
ae7e7d0
cache dir.
lcatlett Nov 15, 2018
61b5559
testing.
lcatlett Nov 15, 2018
6ffcdc7
testing.
lcatlett Nov 15, 2018
49be073
Move core to replace rather than require to avoid package recursion.
lcatlett Nov 10, 2018
f53564b
Remove unneeded scripts.
lcatlett Nov 10, 2018
c648a88
Add autoloading by default and include repository config in root proj…
lcatlett Nov 10, 2018
2d3e3dd
Only update to composer 1.7.2 due to 1.7.3 bug.
lcatlett Nov 10, 2018
5782ea3
Account for require dev dependencies.
lcatlett Nov 10, 2018
5b71605
travis debug
lcatlett Nov 11, 2018
3bd69e4
travis debug
lcatlett Nov 11, 2018
d618900
Optimize autoloader.
lcatlett Nov 15, 2018
9698fd4
Zend opcache settyings.
lcatlett Nov 15, 2018
9c6d22a
Debugging gitattributes.
lcatlett Nov 15, 2018
e13c849
Update process timeout.
lcatlett Nov 15, 2018
735c75a
Symlink changes.
lcatlett Nov 15, 2018
656c8a2
Replace changes.
lcatlett Nov 15, 2018
4332f7e
Replace changes.
lcatlett Nov 15, 2018
f54b6a8
cache dir.
lcatlett Nov 15, 2018
568c315
testing.
lcatlett Nov 15, 2018
4566e38
testing.
lcatlett Nov 15, 2018
cae4e0d
Merge branch 'scan-classes-origin' of github.com:lcatlett/blt into sc…
lcatlett Nov 15, 2018
272b37a
tests.
lcatlett Nov 15, 2018
916c941
test exclude.
lcatlett Nov 15, 2018
08e7992
syntax
lcatlett Nov 15, 2018
4b70ffc
syntax
lcatlett Nov 15, 2018
e1353b6
update gitattributes.
lcatlett Nov 15, 2018
ab21f7e
package updates.
lcatlett Nov 18, 2018
5d57cf2
wip scripts.
lcatlett Nov 19, 2018
6d8745a
Remove flex.
lcatlett Nov 19, 2018
cd5fdf0
Remove flex.
lcatlett Nov 19, 2018
49cff89
Phpcs.
lcatlett Nov 19, 2018
396642d
fix version of drush.
lcatlett Nov 19, 2018
4ebd11a
fix version of drush.
lcatlett Nov 19, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -127,3 +127,4 @@ deployment_identifier

# Ignore phpunit.xml, only phpunit.xml.dist should be committed.
phpunit.xml
symfony.lock
21 changes: 9 additions & 12 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,19 @@ before_install:
# Exit build early if only documentation was changed in a Pull Request.
- source ${BLT_DIR}/scripts/travis/exit_early
# Decrypt private SSH key id_rsa_blt.enc, save as ~/.ssh/id_rsa_blt.
- if [[ "$TRAVIS_PULL_REQUEST" == "false" ]]; then openssl aes-256-cbc -K $encrypted_c0b166e924da_key -iv $encrypted_c0b166e924da_iv -in id_rsa_blt.enc -out ~/.ssh/id_rsa -d; chmod 600 ~/.ssh/id_rsa; ls -lash ~/.ssh; eval "$(ssh-agent -s)"; ssh-add ~/.ssh/id_rsa; fi
#- if [[ "$TRAVIS_PULL_REQUEST" == "false" ]]; then openssl aes-256-cbc -K $encrypted_c0b166e924da_key -iv $encrypted_c0b166e924da_iv -in id_rsa_blt.enc -out ~/.ssh/id_rsa -d; chmod 600 ~/.ssh/id_rsa; ls -lash ~/.ssh; eval "$(ssh-agent -s)"; ssh-add ~/.ssh/id_rsa; fi
- echo "extension = memcached.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
- sudo service memcached status
- phpenv config-rm xdebug.ini
- phpenv config-add travis.php.ini
- composer self-update
- composer self-update 1.7.2
- composer -V
- composer clear-cache
- export COMPOSER_PROCESS_TIMEOUT=2000
- ls -la $HOME
- composer validate --no-check-all --ansi
- composer install
- composer install -vvv
- composer -n info

install:
- source ${BLT_DIR}/scripts/travis/setup_environment
Expand Down Expand Up @@ -82,12 +87,4 @@ before_deploy:
after_success:
# - ./vendor/bin/coveralls -vvv

deploy:
- provider: script
# Deploys build artifact's source branch to acquia-pso/blted8 on GitHub.
script: ${BLT_DIR}/scripts/blt/ci/internal/deploy_blted8.sh
skip_cleanup: true
on:
branch: $DEPLOY_SOURCE_BRANCH
php: 5.6
condition: $DRUPAL_CORE_VERSION = default

13 changes: 11 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"doctrine/common": "^2.5",
"doctrine/inflector": "~1.1.0",
"drupal/coder": "^8.3.1",
"drush/drush": "^9.4.0",
"drush/drush": "9.5.2",
"grasmash/drupal-security-warning": "^1.0.0",
"grasmash/yaml-cli": "^1.0.0",
"grasmash/yaml-expander": "^1.2.0",
Expand All @@ -38,7 +38,8 @@
"symfony/yaml": "^3.2.8",
"tivie/php-os-detector": "^1.0",
"typhonius/acquia-php-sdk-v2": "^1.0.3",
"wikimedia/composer-merge-plugin": "^1.4.1"
"wikimedia/composer-merge-plugin": "^1.4.1",
"consolidation/site-alias": "^1.1.11|^2"
},
"autoload": {
"psr-4": {
Expand Down Expand Up @@ -69,6 +70,14 @@
"typhonius/acquia_cli": "^1.0",
"davereid/drush-acquia-hook-invoke": "dev-master"
},
"scripts": {
"pre-install-cmd": [
"composer dump-autoload --optimize --classmap-authoritative"
],
"pre-update-cmd": [
"composer dump-autoload --optimize --classmap-authoritative"
]
},
"minimum-stability": "dev",
"prefer-stable": true,
"require-dev": {
Expand Down
10 changes: 7 additions & 3 deletions composer.required.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

{
"repositories": {
"drupal": {
Expand All @@ -6,20 +7,23 @@
}
},
"require": {
"drupal/core": "^8.6.0",
"drupal/config_split": "^1.0.0"
"drupal/config_split": "^1.0.0",
"drupal/core": "^8.6.0"
},
"require-dev": {
"behat/behat": ">=3.1 <3.4",
"behat/mink": "^1.7",
"behat/mink-extension": "^2.2",
"bex/behat-screenshot": "^1.2",
"drupal/drupal-extension": "~3.2",
"composer/installers": "^1.2.0",
"drupal-composer/drupal-scaffold": "^2.1.0",
"jarnaiz/behat-junit-formatter": "^1.3.2",
"se/selenium-server-standalone": "^2.53",
"jakoch/phantomjs-installer": "2.1.1-p07",
"dmore/behat-chrome-extension": "^1.0.0",
"sensiolabs-de/deprecation-detector": "dev-master",
"webflo/drupal-core-require-dev": "^8.6.0"
"webflo/drupal-core-require-dev": "8.6.3"
},
"autoload-dev": {
"psr-4": {
Expand Down
2 changes: 1 addition & 1 deletion phpcs.xml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@
<file>scripts/blt/examples</file>
<file>src/Robo</file>
<file>settings</file>
<file>tests</file>
<file>template/blt</file>

<exclude-pattern>*/node_modules</exclude-pattern>
<exclude-pattern>*/vendor</exclude-pattern>
<exclude-pattern>tests</exclude-pattern>
<exclude-pattern>*/default.local.settings.php</exclude-pattern>

</ruleset>
2 changes: 1 addition & 1 deletion settings/blt.settings.php
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@
$name = array_slice($domain_fragments, 1);
$acsf_sites = $blt_config->get('multisites');
if (in_array($name, $acsf_sites)) {
$acsf_site_name = $name;
$_acsf_site_name = $name;
}
}
}
Expand Down
6 changes: 6 additions & 0 deletions template/.gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -79,3 +79,9 @@
*.PDF -text diff
*.jar -text diff
*.JAR -text diff



/.gitattributes export-ignore
/symfony.lock export-ignore
/composer.lock export-ignore
25 changes: 23 additions & 2 deletions template/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,22 @@
"license": "proprietary",
"type": "project",
"config": {
"sort-packages": true
"sort-packages": true,
"optimize-autoloader": true
},
"require": {},
"repositories": {
"drupal": {
"type": "composer",
"url": "https://packages.drupal.org/8"
},
"asset-packagist": {
"type": "composer",
"url": "https://asset-packagist.org"
}
},
"require": {
"zaporylie/composer-drupal-optimizations": "^1.0"
},
"require-dev": {},
"extra": {
"enable-patching": true,
Expand Down Expand Up @@ -32,6 +45,14 @@
"ignore-duplicates": true
}
},
"scripts": {
"pre-install-cmd": [
"composer dump-autoload --optimize --classmap-authoritative"
],
"pre-update-cmd": [
"composer dump-autoload --optimize --classmap-authoritative"
]
},
"minimum-stability": "dev",
"prefer-stable": true
}
1 change: 1 addition & 0 deletions tests/phpunit/bootstrap.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@
use Acquia\Blt\Tests\SandboxManager;

$sandbox_manager = new SandboxManager();

$sandbox_manager->bootstrap();
6 changes: 4 additions & 2 deletions tests/phpunit/src/SandboxManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -158,9 +158,11 @@ protected function installSandboxMasterDependencies() {
$command = '';
$drupal_core_version = getenv('DRUPAL_CORE_VERSION');
if ($drupal_core_version && $drupal_core_version != 'default') {
$command .= 'composer require "drupal/core:' . $drupal_core_version . '" --no-update --no-interaction && ';
$command .= 'composer require "drupal/core:' . $drupal_core_version . '" --no-update --no-interaction "'
&& '"composer require --dev --no-update webflo/drupal-core-require-dev:~"' . $drupal_core_version;
}
$command .= 'composer install --prefer-dist --no-progress --no-suggest';

$command .= 'composer install --prefer-dist --no-progress --no-suggest -vvv';

$process = new Process($command, $this->sandboxMaster);
$process->setTimeout(60 * 60);
Expand Down
15 changes: 15 additions & 0 deletions travis.php.ini
Original file line number Diff line number Diff line change
@@ -1 +1,16 @@
memory_limit = -1

opcache.interned_strings_buffer=16
opcache.log_verbosity_level=2
opcache.max_accelerated_files=10000
opcache.memory_consumption=96
opcache.optimization_level=0
opcache.revalidate_freq=0
opcache.validate_timestamps=1
opcache.revalidate_path=0
opcache.max_file_size=0
opcache.use_cwd=1
opcache.load_comments=1
opcache.save_comments=1
opcache.fast_shutdown=1
opcache.max_file_size=0