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

Use Symplify Symfony static dumper #169

Merged
merged 4 commits into from Mar 12, 2020
Merged
Changes from all commits
Commits
File filter...
Filter file types
Jump to…
Jump to file or symbol
Failed to load files and symbols.

Always

Just for now

@@ -0,0 +1,26 @@
# see https://github.com/marketplace/actions/deploy-to-github-pages
name: Build

on:
pull_request: null
push:
branches:
- master

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- run: composer install --no-progress

-
name: Build
run: |
# configure timezone: https://stackoverflow.com/a/27052708/1348344
export TZ=Europe/Prague
bin/console import --ansi
bin/console dump-static-site --ansi
env:
MEETUP_COM_OAUTH_KEY: ${{ secrets.MEETUP_COM_OAUTH_KEY }}
MEETUP_COM_OAUTH_SECRET: ${{ secrets.MEETUP_COM_OAUTH_SECRET }}
@@ -2,33 +2,35 @@
"name": "friends-of-php/friends-of-php",
"require": {
"php": "^7.3",
"doctrine/cache": "^1.10",
"ext-simplexml": "*",
"doctrine/cache": "^1.10",
"guzzlehttp/guzzle": "^6.5",
"kamermans/guzzle-oauth2-subscriber": "^1.0",
"league/period": "^4.9",
"mjaschen/phpgeo": "^2.1",
"nette/utils": "^3.0",
"rinvex/countries": "^3.1",
"symfony/asset": "^5.0",
"symfony/console": "^5.0",
"symfony/debug-bundle": "^5.0",
"symfony/dependency-injection": "^5.0",
"symfony/dom-crawler": "^5.0",
"symfony/dotenv": "^5.0",
"symfony/http-kernel": "^5.0",
"symfony/flex": "^1.4",
"symfony/framework-bundle": "^5.0",
"symfony/http-kernel": "^5.0",
"symfony/twig-bridge": "^5.0",
"symfony/twig-bundle": "^5.0",
"symplify/autodiscovery": "^7.2",
"symplify/flex-loader": "^7.2",
"symplify/package-builder": "^7.2"
"symplify/autodiscovery": "^7.3",
"symplify/flex-loader": "^7.3",
"symplify/package-builder": "^7.3",
"symplify/symfony-static-dumper": "dev-master"
},
"require-dev": {
"phpstan/phpstan": "^0.12",
"phpunit/phpunit": "^8.5",
"symplify/phpstan-extensions": "^7.2",
"symplify/easy-coding-standard": "^7.2"
"symplify/phpstan-extensions": "^7.3",
"symplify/easy-coding-standard": "^7.3"
},
"autoload": {
"psr-4": {
@@ -38,8 +40,7 @@
"Fop\\Hydrator\\": "packages/hydrator/src",
"Fop\\MeetupCom\\": "packages/meetup-com/src",
"Fop\\CrosswebPl\\": "packages/crossweb-pl/src",
"Fop\\OpentechcalendarCoUk\\": "packages/opentechcalendar-co-uk/src",
"Fop\\StaticSiteDumper\\": "packages/static-site-dumper/src"
"Fop\\OpentechcalendarCoUk\\": "packages/opentechcalendar-co-uk/src"
}
},
"autoload-dev": {
@@ -73,5 +74,7 @@
"symfony": {
"allow-contrib": true
}
}
},
"minimum-stability": "dev",
"prefer-stable": true
}
@@ -1,5 +1,6 @@
imports:
- { resource: 'parameters.yaml' }
- { resource: '../vendor/symplify/symfony-static-dumper/config/config.yaml' }

services:
_defaults:
@@ -20,3 +21,4 @@ services:

GuzzleHttp\Client: null
Symplify\PackageBuilder\Http\BetterGuzzleClient: null

This file was deleted.

This file was deleted.

This file was deleted.

@@ -18,10 +18,7 @@ parameters:
- '#return type has no value type specified in iterable type Iterator#'
- '#no value type specified in iterable type array#'

- '#Property Fop\\Group\\Repository\\GroupRepository\:\:\$groups \(array<Fop\\ValueObject\\Group\>\) does not accept array<object\>#'
- '#Cannot call method getName\(\) on ReflectionType\|null#'
- '#Property Fop\\Repository\\MeetupRepository\:\:\$meetups \(array<Fop\\ValueObject\\Meetup\>\) does not accept array<object\>#'

# variadic
- '#Method Fop\\MeetupCom\\Api\\MeetupComRequestRunner\:\:runCallbackWithinRequestLimits\(\) has parameter \$args with no typehint specified#'
- '#Property Fop\\Meetup\\Repository\\MeetupRepository\:\:\$meetups \(array<Fop\\Meetup\\ValueObject\\Meetup\>\) does not accept array<object\>#'
@@ -7,7 +7,7 @@ $(function() {
tresholdDate.setHours(tresholdDate.getHours() - 2);
var tresholdDateTime = Date.parse(tresholdDate);

$("tr.meetup").each(function () {
$("#map-filterable-table tr.meetup").each(function () {
var meetupLatLng = L.latLng($(this).data('latitude'), $(this).data('longitude'));
if (bounds.contains(meetupLatLng)) {
// is in the past?
@@ -22,15 +22,6 @@ $(function() {
$(this).hide();
}
});

// see https://stackoverflow.com/a/20064911/1348344
var visibleMeetups = $("table#table-meetups tr.meetup:visible").length;

if (visibleMeetups === 0) {
$("#block-zoomout").show();
} else {
$("#block-zoomout").hide();
}
};

// show relevant meetups when map moves
@@ -200,8 +200,10 @@ footer ul, #groups ul {
text-decoration: none;
}

#table-meetups_filter input {
font-size: 1em;
#static-table_filter input, #map-filterable-table_filter input {
font-size: 1.2em;
margin-left: -.2em;
margin-bottom: .6em;
width: 100%;
color: #333;
}
@@ -232,6 +232,9 @@
"phpcs.xml.dist"
]
},
"symfony/asset": {
"version": "v5.0.5"
},
"symfony/cache": {
"version": "v5.0.5"
},
@@ -431,6 +434,9 @@
"symplify/smart-file-system": {
"version": "v7.2.3"
},
"symplify/symfony-static-dumper": {
"version": "7.3-dev"
},
"theseer/tokenizer": {
"version": "1.1.3"
},
@@ -11,9 +11,9 @@
};
// see https://datatables.net/examples/index
$('#table-meetups').DataTable({
$('.table-meetups').DataTable({
// see https://datatables.net/examples/basic_init/filter_only.html
// "searching": true,
"searching": true,
"paging": false,
"ordering": false,
"info": false,
@@ -22,7 +22,8 @@
}
});
$("[aria-controls='table-meetups']").attr('placeholder', 'Filter Meetups...');
$("[aria-controls='static-table']").attr('placeholder', 'Filter Meetups...');
$("[aria-controls='map-filterable-table']").attr('placeholder', 'Filter Meetups...');
</script>

<footer class="pb-5 pt-5 mt-5">
@@ -33,5 +33,5 @@
<link rel="preconnect" href="https://www.google-analytics.com">

{# this is the last, so prism can be overriden here #}
<link href="/assets/style.css?v={{ random() }}" rel="stylesheet" type="text/css" />
<link href="{{ asset('assets/style.css') }}" rel="stylesheet" type="text/css" />
</head>
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.